Commit ad9f6713 authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 22fe472c
...@@ -536,6 +536,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev, ...@@ -536,6 +536,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
u16 device_id; u16 device_id;
int reg, rc = -ENODEV; int reg, rc = -ENODEV;
#ifdef CONFIG_PCI
if (pdev) { if (pdev) {
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (rc) if (rc)
...@@ -547,6 +548,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev, ...@@ -547,6 +548,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
goto err_out; goto err_out;
} }
} }
#endif /* CONFIG_PCI */
dev = alloc_etherdev(sizeof(TLanPrivateInfo)); dev = alloc_etherdev(sizeof(TLanPrivateInfo));
if (dev == NULL) { if (dev == NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment