diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/smc91x.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/smc91x.h')
| -rw-r--r-- | drivers/net/smc91x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 68d48ab6eac..5f53fbbf67b 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -921,7 +921,7 @@ static const char * chip_ids[ 16 ] = { | |||
| 921 | * Hack Alert: Some setups just can't write 8 or 16 bits reliably when not | 921 | * Hack Alert: Some setups just can't write 8 or 16 bits reliably when not |
| 922 | * aligned to a 32 bit boundary. I tell you that does exist! | 922 | * aligned to a 32 bit boundary. I tell you that does exist! |
| 923 | * Fortunately the affected register accesses can be easily worked around | 923 | * Fortunately the affected register accesses can be easily worked around |
| 924 | * since we can write zeroes to the preceeding 16 bits without adverse | 924 | * since we can write zeroes to the preceding 16 bits without adverse |
| 925 | * effects and use a 32-bit access. | 925 | * effects and use a 32-bit access. |
| 926 | * | 926 | * |
| 927 | * Enforce it on any 32-bit capable setup for now. | 927 | * Enforce it on any 32-bit capable setup for now. |