diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /drivers/net/es3210.c | |
| parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
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; |