---

yaml --- r: 295969 b: refs/heads/master c: 63ecf0a h: refs/heads/master i: 295967: 13fa384 v: v3
git-mirror · Mar 14, 2012 · 532f4a3 · 532f4a3
1 parent 29d1a94
commit 532f4a3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git 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
@@ -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[] = {