diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /drivers/net/ac3200.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
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; |