Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 32095
b: refs/heads/master
c: dcaf976
h: refs/heads/master
i:
  32093: dedf2aa
  32091: a1e75fe
  32087: 7899466
  32079: a56cdb5
  32063: 88bc901
v: v3
  • Loading branch information
Don Fry authored and Jeff Garzik committed Jul 5, 2006
1 parent 0c9442b commit 553482e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0c639b31068e8e111ec330a3634d95e20c11aab6
refs/heads/master: dcaf9769801ff49268f5a7a8376045e251700dcf
5 changes: 2 additions & 3 deletions trunk/drivers/net/pcnet32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 553482e

Please sign in to comment.