diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
| commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
| tree | 79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/wd.c | |
| parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
| parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/wd.c')
| -rw-r--r-- | drivers/net/wd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index 7caa8dc88a58..b1ba1872f315 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c | |||
| @@ -500,8 +500,8 @@ MODULE_LICENSE("GPL"); | |||
| 500 | 500 | ||
| 501 | /* This is set up so that only a single autoprobe takes place per call. | 501 | /* This is set up so that only a single autoprobe takes place per call. |
| 502 | ISA device autoprobes on a running machine are not recommended. */ | 502 | ISA device autoprobes on a running machine are not recommended. */ |
| 503 | int | 503 | |
| 504 | init_module(void) | 504 | int __init init_module(void) |
| 505 | { | 505 | { |
| 506 | struct net_device *dev; | 506 | struct net_device *dev; |
| 507 | int this_dev, found = 0; | 507 | int this_dev, found = 0; |