diff options
Diffstat (limited to 'drivers/pcmcia')
-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 81af2b3bcc00..69ae2fd22400 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) | |||
48 | { | 48 | { |
49 | int ret; | 49 | int ret; |
50 | 50 | ||
51 | if (platform_scoop_config->pcmcia_init) | ||
52 | platform_scoop_config->pcmcia_init(); | ||
53 | |||
54 | /* Register interrupts */ | 51 | /* Register interrupts */ |
55 | if (SCOOP_DEV[skt->nr].cd_irq >= 0) { | 52 | if (SCOOP_DEV[skt->nr].cd_irq >= 0) { |
56 | struct pcmcia_irqs cd_irq; | 53 | struct pcmcia_irqs cd_irq; |
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c index b829e655457b..57ddb969d888 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) | |||
55 | } | 55 | } |
56 | skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY); | 56 | skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY); |
57 | break; | 57 | break; |
58 | |||
59 | #ifndef CONFIG_MACH_TRIZEPS_CONXS | ||
60 | case 1: | ||
61 | #endif | ||
62 | default: | 58 | default: |
63 | break; | 59 | break; |
64 | } | 60 | } |