diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2006-06-10 16:30:10 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 12:16:01 -0400 |
commit | a2bd2ec8d1bef7479d26d375162963106757e8e9 (patch) | |
tree | dc68527991d0bdaddec167bbe8ab4119c82faf7e /drivers/net | |
parent | 29f9f6d234753da97b74402f746981c63ec0b2f0 (diff) |
[PATCH] smc ethernet: fix section mismatch warnings
Priority: not critical; makes init code discardable.
Removes one duplicate assignment.
Fix section mismatch warnings:
WARNING: drivers/net/smc-ultra.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x369) and 'cleanup_card'
WARNING: drivers/net/smc-ultra32.o - Section mismatch: reference to .init.text:ultra32_probe from .text between 'init_module' (at offset 0x254) and 'cleanup_module'
WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.text:smc_init from .text between 'init_module' (at offset 0x997) and 'cleanup_module'
WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.data: from .data between 'smcdev.0' (at offset 0x44) and '__param_str_io'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/smc-ultra.c | 2 | ||||
-rw-r--r-- | drivers/net/smc-ultra32.c | 2 | ||||
-rw-r--r-- | drivers/net/smc9194.c | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index 3db30cd0625e..5b4e8529d4ab 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c | |||
@@ -553,7 +553,7 @@ MODULE_LICENSE("GPL"); | |||
553 | 553 | ||
554 | /* This is set up so that only a single autoprobe takes place per call. | 554 | /* This is set up so that only a single autoprobe takes place per call. |
555 | ISA device autoprobes on a running machine are not recommended. */ | 555 | ISA device autoprobes on a running machine are not recommended. */ |
556 | int | 556 | int __init |
557 | init_module(void) | 557 | init_module(void) |
558 | { | 558 | { |
559 | struct net_device *dev; | 559 | struct net_device *dev; |
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 | ||
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index f86697da04d6..6cf16f322ad5 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
@@ -732,12 +732,9 @@ static int ifport; | |||
732 | struct net_device * __init smc_init(int unit) | 732 | struct net_device * __init smc_init(int unit) |
733 | { | 733 | { |
734 | struct net_device *dev = alloc_etherdev(sizeof(struct smc_local)); | 734 | struct net_device *dev = alloc_etherdev(sizeof(struct smc_local)); |
735 | static struct devlist *smcdev = smc_devlist; | 735 | struct devlist *smcdev = smc_devlist; |
736 | int err = 0; | 736 | int err = 0; |
737 | 737 | ||
738 | #ifndef NO_AUTOPROBE | ||
739 | smcdev = smc_devlist; | ||
740 | #endif | ||
741 | if (!dev) | 738 | if (!dev) |
742 | return ERR_PTR(-ENODEV); | 739 | return ERR_PTR(-ENODEV); |
743 | 740 | ||
@@ -1607,7 +1604,7 @@ MODULE_PARM_DESC(io, "SMC 99194 I/O base address"); | |||
1607 | MODULE_PARM_DESC(irq, "SMC 99194 IRQ number"); | 1604 | MODULE_PARM_DESC(irq, "SMC 99194 IRQ number"); |
1608 | MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)"); | 1605 | MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)"); |
1609 | 1606 | ||
1610 | int init_module(void) | 1607 | int __init init_module(void) |
1611 | { | 1608 | { |
1612 | if (io == 0) | 1609 | if (io == 0) |
1613 | printk(KERN_WARNING | 1610 | printk(KERN_WARNING |