diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
| commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
| tree | 470cce472be3b08c160e0c569648e7228651b12a /drivers/net/tlan.c | |
| parent | ebcff3c773b42bce6182ec16485abca4e53fba97 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
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) { |