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/myri_sbus.c | |
| 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/myri_sbus.c')
| -rw-r--r-- | drivers/net/myri_sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index a761076b69c..53aeea4b536 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -1009,7 +1009,7 @@ static int __devinit myri_sbus_probe(struct platform_device *op) | |||
| 1009 | 1009 | ||
| 1010 | /* Map in the MyriCOM register/localram set. */ | 1010 | /* Map in the MyriCOM register/localram set. */ |
| 1011 | if (mp->eeprom.cpuvers < CPUVERS_4_0) { | 1011 | if (mp->eeprom.cpuvers < CPUVERS_4_0) { |
| 1012 | /* XXX Makes no sense, if control reg is non-existant this | 1012 | /* XXX Makes no sense, if control reg is non-existent this |
| 1013 | * XXX driver cannot function at all... maybe pre-4.0 is | 1013 | * XXX driver cannot function at all... maybe pre-4.0 is |
| 1014 | * XXX only a valid version for PCI cards? Ask feldy... | 1014 | * XXX only a valid version for PCI cards? Ask feldy... |
| 1015 | */ | 1015 | */ |