diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-01-06 15:07:05 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-02-08 20:59:09 +0100 |
| commit | 083922fe1c277603a03f0ca700fe5a76f11178c7 (patch) | |
| tree | 13d1d1a6539cd92ca0f65b0a0ef246d66d7d1e4c /drivers/ieee1394 | |
| parent | b2051f887351864d862160e75bc24362c7af8914 (diff) | |
| download | linux-3.10-083922fe1c277603a03f0ca700fe5a76f11178c7.tar.gz linux-3.10-083922fe1c277603a03f0ca700fe5a76f11178c7.tar.bz2 linux-3.10-083922fe1c277603a03f0ca700fe5a76f11178c7.zip | |
ieee1394: ohci1394: drop pcmcia-cs compatibility code
#ifdef PCMCIA is only true if compiled inside pcmcia-cs, isn't it?
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 380212573fb..b7e816683fb 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -3281,14 +3281,11 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!", (unsigned long long)pci_resource_len(dev, 0)); - /* Seems PCMCIA handles this internally. Not sure why. Seems - * pretty bogus to force a driver to special case this. */ -#ifndef PCMCIA - if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME)) + if (!request_mem_region(ohci_base, OHCI1394_REGISTER_SIZE, + OHCI1394_DRIVER_NAME)) FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable", (unsigned long long)ohci_base, (unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE); -#endif ohci->init_state = OHCI_INIT_HAVE_MEM_REGION; ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE); @@ -3509,10 +3506,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) iounmap(ohci->registers); case OHCI_INIT_HAVE_MEM_REGION: -#ifndef PCMCIA release_mem_region(pci_resource_start(ohci->dev, 0), OHCI1394_REGISTER_SIZE); -#endif #ifdef CONFIG_PPC_PMAC /* On UniNorth, power down the cable and turn off the chip clock |