diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 22:21:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 22:21:29 -0800 |
| commit | f52ee1410d563cd409b08822492273a5bc235821 (patch) | |
| tree | 18694453f85c25cf7ffea2d9111067451cbaed0b /drivers/net/tlan.c | |
| parent | c0eea79bd2adcc4708973fdbf72a0a292aa60d71 (diff) | |
| parent | ad9f6713ae59f319ed676c2d014a7756b62f1c51 (diff) | |
| download | op-kernel-dev-f52ee1410d563cd409b08822492273a5bc235821.zip op-kernel-dev-f52ee1410d563cd409b08822492273a5bc235821.tar.gz | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tlan.c')
| -rw-r--r-- | drivers/net/tlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index c2506b5..12076f8 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c @@ -536,6 +536,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev, u16 device_id; int reg, rc = -ENODEV; +#ifdef CONFIG_PCI if (pdev) { rc = pci_enable_device(pdev); if (rc) @@ -547,6 +548,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev, goto err_out; } } +#endif /* CONFIG_PCI */ dev = alloc_etherdev(sizeof(TLanPrivateInfo)); if (dev == NULL) { |
