diff options
| author | Don Fry <brazilnut@us.ibm.com> | 2006-06-29 22:52:29 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 20:07:15 +0200 |
| commit | dcaf9769801ff49268f5a7a8376045e251700dcf (patch) | |
| tree | 92faf42db126dcc5c2f10620d38ed7fc1b1f6534 /drivers | |
| parent | [PATCH] Add support for the Cicada 8201 PHY (diff) | |
| download | linux-dcaf9769801ff49268f5a7a8376045e251700dcf.tar.xz linux-dcaf9769801ff49268f5a7a8376045e251700dcf.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/pcnet32.c | 5 |
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 { u32 phymask; }; -static void pcnet32_probe_vlbus(void); static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *); static int pcnet32_probe1(unsigned long, int, struct pci_dev *); static int pcnet32_open(struct net_device *); @@ -952,7 +951,7 @@ static struct ethtool_ops pcnet32_ethtool_ops = { /* only probes for non-PCI devices, the rest are handled by * pci_register_driver via pcnet32_probe_pci */ -static void __devinit pcnet32_probe_vlbus(void) +static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist) { unsigned int *port, ioaddr; @@ -2730,7 +2729,7 @@ static int __init pcnet32_init_module(void) /* should we find any remaining VLbus devices ? */ if (pcnet32vlb) - pcnet32_probe_vlbus(); + pcnet32_probe_vlbus(pcnet32_portlist); if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE)) printk(KERN_INFO PFX "%d cards_found.\n", cards_found); |