diff --git a/[refs] b/[refs]
index 40509ce9f783..e215550b6839 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd419cf922bdb50d33c98c9a0c81f51a40609f66
+refs/heads/master: 63ecf0a9b55ada8c59ac10472c4468b46cf2e97a
diff --git a/trunk/arch/arm/mach-pxa/hx4700.c b/trunk/arch/arm/mach-pxa/hx4700.c
index f49043cbab10..0e7806a7e971 100644
--- a/trunk/arch/arm/mach-pxa/hx4700.c
+++ b/trunk/arch/arm/mach-pxa/hx4700.c
@@ -787,17 +787,6 @@ static struct platform_device audio = {
 };
 
 
-/*
- * PCMCIA
- */
-
-static struct platform_device pcmcia = {
-	.name = "hx4700-pcmcia",
-	.dev  = {
-		.parent = &asic3.dev,
-	},
-};
-
 /*
  * Platform devices
  */
@@ -814,7 +803,6 @@ static struct platform_device *devices[] __initdata = {
 	&power_supply,
 	&strataflash,
 	&audio,
-	&pcmcia,
 };
 
 static struct gpio global_gpios[] = {