aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Fry <brazilnut@us.ibm.com>2006-06-29 16:52:29 -0400
committerJeff Garzik <jeff@garzik.org>2006-07-05 14:07:15 -0400
commitdcaf9769801ff49268f5a7a8376045e251700dcf (patch)
tree92faf42db126dcc5c2f10620d38ed7fc1b1f6534
parent0c639b31068e8e111ec330a3634d95e20c11aab6 (diff)
[PATCH] pcnet32: Fix Section mismatch error
Fix Section mismatch error. Tested ia32 and ppc64. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/pcnet32.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index d768f3d1ac28..5d9be50fd982 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -277,7 +277,6 @@ struct pcnet32_private {
277 u32 phymask; 277 u32 phymask;
278}; 278};
279 279
280static void pcnet32_probe_vlbus(void);
281static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *); 280static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);
282static int pcnet32_probe1(unsigned long, int, struct pci_dev *); 281static int pcnet32_probe1(unsigned long, int, struct pci_dev *);
283static int pcnet32_open(struct net_device *); 282static int pcnet32_open(struct net_device *);
@@ -952,7 +951,7 @@ static struct ethtool_ops pcnet32_ethtool_ops = {
952/* only probes for non-PCI devices, the rest are handled by 951/* only probes for non-PCI devices, the rest are handled by
953 * pci_register_driver via pcnet32_probe_pci */ 952 * pci_register_driver via pcnet32_probe_pci */
954 953
955static void __devinit pcnet32_probe_vlbus(void) 954static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)
956{ 955{
957 unsigned int *port, ioaddr; 956 unsigned int *port, ioaddr;
958 957
@@ -2730,7 +2729,7 @@ static int __init pcnet32_init_module(void)
2730 2729
2731 /* should we find any remaining VLbus devices ? */ 2730 /* should we find any remaining VLbus devices ? */
2732 if (pcnet32vlb) 2731 if (pcnet32vlb)
2733 pcnet32_probe_vlbus(); 2732 pcnet32_probe_vlbus(pcnet32_portlist);
2734 2733
2735 if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE)) 2734 if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE))
2736 printk(KERN_INFO PFX "%d cards_found.\n", cards_found); 2735 printk(KERN_INFO PFX "%d cards_found.\n", cards_found);