diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/3c59x.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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 | } |