diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /drivers/net/es3210.c | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/net/es3210.c')
| -rw-r--r-- | drivers/net/es3210.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c index 6b0ab1eac3fb..fd7b32a24ea4 100644 --- a/drivers/net/es3210.c +++ b/drivers/net/es3210.c | |||
| @@ -421,8 +421,7 @@ MODULE_PARM_DESC(mem, "memory base address(es)"); | |||
| 421 | MODULE_DESCRIPTION("Racal-Interlan ES3210 EISA ethernet driver"); | 421 | MODULE_DESCRIPTION("Racal-Interlan ES3210 EISA ethernet driver"); |
| 422 | MODULE_LICENSE("GPL"); | 422 | MODULE_LICENSE("GPL"); |
| 423 | 423 | ||
| 424 | int | 424 | int __init init_module(void) |
| 425 | init_module(void) | ||
| 426 | { | 425 | { |
| 427 | struct net_device *dev; | 426 | struct net_device *dev; |
| 428 | int this_dev, found = 0; | 427 | int this_dev, found = 0; |