diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /drivers/net/smc-ultra32.c | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/smc-ultra32.c')
| -rw-r--r-- | drivers/net/smc-ultra32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c index b3e397d7ca85..ff9bd97746dc 100644 --- a/drivers/net/smc-ultra32.c +++ b/drivers/net/smc-ultra32.c | |||
| @@ -421,7 +421,7 @@ static struct net_device *dev_ultra[MAX_ULTRA32_CARDS]; | |||
| 421 | MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver"); | 421 | MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver"); |
| 422 | MODULE_LICENSE("GPL"); | 422 | MODULE_LICENSE("GPL"); |
| 423 | 423 | ||
| 424 | int init_module(void) | 424 | int __init init_module(void) |
| 425 | { | 425 | { |
| 426 | int this_dev, found = 0; | 426 | int this_dev, found = 0; |
| 427 | 427 | ||