diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /drivers/net/tlan.c | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/tlan.c')
| -rw-r--r-- | drivers/net/tlan.c | 2 |
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, | |||
| 536 | u16 device_id; | 536 | u16 device_id; |
| 537 | int reg, rc = -ENODEV; | 537 | int reg, rc = -ENODEV; |
| 538 | 538 | ||
| 539 | #ifdef CONFIG_PCI | ||
| 539 | if (pdev) { | 540 | if (pdev) { |
| 540 | rc = pci_enable_device(pdev); | 541 | rc = pci_enable_device(pdev); |
| 541 | if (rc) | 542 | if (rc) |
| @@ -547,6 +548,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev, | |||
| 547 | goto err_out; | 548 | goto err_out; |
| 548 | } | 549 | } |
| 549 | } | 550 | } |
| 551 | #endif /* CONFIG_PCI */ | ||
| 550 | 552 | ||
| 551 | dev = alloc_etherdev(sizeof(TLanPrivateInfo)); | 553 | dev = alloc_etherdev(sizeof(TLanPrivateInfo)); |
| 552 | if (dev == NULL) { | 554 | if (dev == NULL) { |