From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Mon, 6 Jun 2011 13:52:25 +0000 (+0100)
Subject: pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefs
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=226d3a151108970cb0c0c74c3a0ec2c073fdc186;p=linux-beck.git

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>
---

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;
 	}