summaryrefslogtreecommitdiffstats
path: root/drivers/net/tlan.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-02-05 00:37:47 +0100
committerJeff Garzik <jeff@garzik.org>2006-02-24 00:20:08 -0500
commitad9f6713ae59f319ed676c2d014a7756b62f1c51 (patch)
treeac693004a23586ab8294c46a0eb19903547aa518 /drivers/net/tlan.c
parent22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 (diff)
downloadlinux-ad9f6713ae59f319ed676c2d014a7756b62f1c51.tar.gz
linux-ad9f6713ae59f319ed676c2d014a7756b62f1c51.tar.bz2
linux-ad9f6713ae59f319ed676c2d014a7756b62f1c51.zip
[PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific code
drivers/net/tlan.c compiles with CONFIG_PCI=n only with a warning and due to the dead code elimination of gcc. Additionally, this fixes the only compile error I found with CONFIG_PCI=n and the gcc -Werror-implicit-function-declaration flag on i386. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tlan.c')
-rw-r--r--drivers/net/tlan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index c2506b56a186..12076f8f942c 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) {