diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:49:03 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:49:03 +0200 |
| commit | 3eb17c93963c5f63c5236704ac4c905339f6bc06 (patch) | |
| tree | 5ffdbb384f77865314656d28f91d968bd1d3db0c /drivers | |
| parent | bcacff291c96c163da9341b764f0ccdeb97b38ad (diff) | |
| parent | 09dd9b39abf85b8fae3ea105a81825478dd227b6 (diff) | |
Merge branch 'next/cleanup' into for-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_sharpsl.c | 3 | ||||
| -rw-r--r-- | drivers/pcmcia/pxa2xx_trizeps4.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index 81af2b3bcc0..69ae2fd2240 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -48,9 +48,6 @@ static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { int ret; - if (platform_scoop_config->pcmcia_init) - platform_scoop_config->pcmcia_init(); - /* Register interrupts */ if (SCOOP_DEV[skt->nr].cd_irq >= 0) { struct pcmcia_irqs cd_irq; diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c index b829e655457..57ddb969d88 100644 --- a/drivers/pcmcia/pxa2xx_trizeps4.c +++ b/drivers/pcmcia/pxa2xx_trizeps4.c @@ -55,10 +55,6 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt) } skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY); break; - -#ifndef CONFIG_MACH_TRIZEPS_CONXS - case 1: -#endif default: break; } |