diff --git a/[refs] b/[refs]
index 756444e32b76..3bf284ac94a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b34e7b4f05730e6f26e9d8d3736271b0e4cdeac2
+refs/heads/master: 226d3a151108970cb0c0c74c3a0ec2c073fdc186
diff --git a/trunk/drivers/pcmcia/pxa2xx_trizeps4.c b/trunk/drivers/pcmcia/pxa2xx_trizeps4.c
index b829e655457b..57ddb969d888 100644
--- a/trunk/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/trunk/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;
 	}