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/ac3200.c | |
parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/ac3200.c')
-rw-r--r-- | drivers/net/ac3200.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c index 7952dc6d77e3..0fbbcb75af69 100644 --- a/drivers/net/ac3200.c +++ b/drivers/net/ac3200.c | |||
@@ -370,8 +370,7 @@ MODULE_PARM_DESC(mem, "Memory base address(es)"); | |||
370 | MODULE_DESCRIPTION("Ansel AC3200 EISA ethernet driver"); | 370 | MODULE_DESCRIPTION("Ansel AC3200 EISA ethernet driver"); |
371 | MODULE_LICENSE("GPL"); | 371 | MODULE_LICENSE("GPL"); |
372 | 372 | ||
373 | int | 373 | int __init init_module(void) |
374 | init_module(void) | ||
375 | { | 374 | { |
376 | struct net_device *dev; | 375 | struct net_device *dev; |
377 | int this_dev, found = 0; | 376 | int this_dev, found = 0; |