From 553482e4a5748eb140f3184eb27367877bf35fb4 Mon Sep 17 00:00:00 2001 From: Don Fry Date: Thu, 29 Jun 2006 13:52:29 -0700 Subject: [PATCH] --- yaml --- r: 32095 b: refs/heads/master c: dcaf9769801ff49268f5a7a8376045e251700dcf h: refs/heads/master i: 32093: dedf2aad74ed0e53c817e4d18b2a5d80717a0c3e 32091: a1e75fedf142e43cee2d7310bc943ab00559098c 32087: 789946650e9bd4593a133eccdd9fc05a74bfed23 32079: a56cdb51af1b03fcd2aff78eb616f67f0fa94698 32063: 88bc90129bcacc6a7b94e916a7f47f7ac0bd4a1f v: v3 --- [refs] | 2 +- trunk/drivers/net/pcnet32.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fd19bfa5843f..660190652f1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c639b31068e8e111ec330a3634d95e20c11aab6 +refs/heads/master: dcaf9769801ff49268f5a7a8376045e251700dcf diff --git a/trunk/drivers/net/pcnet32.c b/trunk/drivers/net/pcnet32.c index d768f3d1ac28..5d9be50fd982 100644 --- a/trunk/drivers/net/pcnet32.c +++ b/trunk/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);