diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/3c59x.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 | } |