From: Adrian Bunk <bunk@stusta.de>
Date: Sat, 4 Feb 2006 23:37:47 +0000 (+0100)
Subject: [PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific code
X-Git-Tag: v2.6.16-rc5~53^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad9f6713ae59f319ed676c2d014a7756b62f1c51;p=linux-2.6

[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>
---

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index c2506b56a1..12076f8f94 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) {