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/3c59x.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/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 0a92436f0538..8cc22568ebd3 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -984,7 +984,7 @@ static int __init vortex_eisa_init(void) | |||
| 984 | * any device have been found when we exit from | 984 | * any device have been found when we exit from |
| 985 | * eisa_driver_register (the bus root driver may not be | 985 | * eisa_driver_register (the bus root driver may not be |
| 986 | * initialized yet). So we blindly assume something was | 986 | * initialized yet). So we blindly assume something was |
| 987 | * found, and let the sysfs magic happend... | 987 | * found, and let the sysfs magic happened... |
| 988 | */ | 988 | */ |
| 989 | eisa_found = 1; | 989 | eisa_found = 1; |
| 990 | } | 990 | } |