summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pxa2xx_trizeps4.c
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-06-06 15:52:25 +0200
committerEric Miao <eric.y.miao@gmail.com>2011-07-11 08:43:33 +0200
commit226d3a151108970cb0c0c74c3a0ec2c073fdc186 (patch)
tree1c4a2592218130b6c0a41f49bfd7f5ce778f98ad /drivers/pcmcia/pxa2xx_trizeps4.c
parentARM: scoop: drop pcmcia_init callback (diff)
downloadlinux-226d3a151108970cb0c0c74c3a0ec2c073fdc186.tar.xz
linux-226d3a151108970cb0c0c74c3a0ec2c073fdc186.zip
pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefs
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_trizeps4.c')
-rw-r--r--drivers/pcmcia/pxa2xx_trizeps4.c4
1 files changed, 0 insertions, 4 deletions
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)
}
skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
break;
-
-#ifndef CONFIG_MACH_TRIZEPS_CONXS
- case 1:
-#endif
default:
break;
}