projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
[powerpc.git]
/
drivers
/
net
/
tlan.c
diff --git
a/drivers/net/tlan.c
b/drivers/net/tlan.c
index
c2506b5
..
12076f8
100644
(file)
--- 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) {