projects
/
deliverable
/
linux.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/davem/net-2.6
[deliverable/linux.git]
/
drivers
/
net
/
tlan.c
diff --git
a/drivers/net/tlan.c
b/drivers/net/tlan.c
index c2506b56a18691f0eb4f4bfa9830fc8f877657a6..12076f8f942c7d40017bfefbd016f3fe5f3dc710 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) {
This page took
0.039605 seconds
and
5
git commands to generate.