From cc9f605bcd0191c456ab6eacb3547f554b8a8775 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 10 Jun 2006 13:30:10 -0700 Subject: [PATCH] --- yaml --- r: 27430 b: refs/heads/master c: a2bd2ec8d1bef7479d26d375162963106757e8e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/smc-ultra.c | 2 +- trunk/drivers/net/smc-ultra32.c | 2 +- trunk/drivers/net/smc9194.c | 7 ++----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ba6cf69c3d37..7c3e9c37eed4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29f9f6d234753da97b74402f746981c63ec0b2f0 +refs/heads/master: a2bd2ec8d1bef7479d26d375162963106757e8e9 diff --git a/trunk/drivers/net/smc-ultra.c b/trunk/drivers/net/smc-ultra.c index 3db30cd0625e..5b4e8529d4ab 100644 --- a/trunk/drivers/net/smc-ultra.c +++ b/trunk/drivers/net/smc-ultra.c @@ -553,7 +553,7 @@ MODULE_LICENSE("GPL"); /* This is set up so that only a single autoprobe takes place per call. ISA device autoprobes on a running machine are not recommended. */ -int +int __init init_module(void) { struct net_device *dev; diff --git a/trunk/drivers/net/smc-ultra32.c b/trunk/drivers/net/smc-ultra32.c index b3e397d7ca85..ff9bd97746dc 100644 --- a/trunk/drivers/net/smc-ultra32.c +++ b/trunk/drivers/net/smc-ultra32.c @@ -421,7 +421,7 @@ static struct net_device *dev_ultra[MAX_ULTRA32_CARDS]; MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver"); MODULE_LICENSE("GPL"); -int init_module(void) +int __init init_module(void) { int this_dev, found = 0; diff --git a/trunk/drivers/net/smc9194.c b/trunk/drivers/net/smc9194.c index f86697da04d6..6cf16f322ad5 100644 --- a/trunk/drivers/net/smc9194.c +++ b/trunk/drivers/net/smc9194.c @@ -732,12 +732,9 @@ static int ifport; struct net_device * __init smc_init(int unit) { struct net_device *dev = alloc_etherdev(sizeof(struct smc_local)); - static struct devlist *smcdev = smc_devlist; + struct devlist *smcdev = smc_devlist; int err = 0; -#ifndef NO_AUTOPROBE - smcdev = smc_devlist; -#endif if (!dev) return ERR_PTR(-ENODEV); @@ -1607,7 +1604,7 @@ MODULE_PARM_DESC(io, "SMC 99194 I/O base address"); MODULE_PARM_DESC(irq, "SMC 99194 IRQ number"); MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)"); -int init_module(void) +int __init init_module(void) { if (io == 0) printk(KERN_WARNING