Index: blueangel.c
===================================================================
RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/htcblueangel/blueangel.c,v
retrieving revision 1.32
diff -u -r1.32 blueangel.c
--- blueangel.c	20 Jun 2007 21:12:39 -0000	1.32
+++ blueangel.c	7 Jul 2007 17:36:54 -0000
@@ -213,10 +213,8 @@
 extern struct platform_device blueangel_bl;
 static struct platform_device blueangel_lcd = { .name = "blueangel-lcd", };
 static struct platform_device blueangel_leds = { .name = "blueangel-leds", };
-#ifdef CONFIG_BLUEANGEL_PCMCIA
-static struct platform_device htcblueangel_pcmcia    = { .name =
-                                            "htcblueangel_pcmcia", };
-#endif
+static struct platform_device blueangel_pcmcia    = { .name =
+                                            "blueangel-pcmcia", };
 
 /*
  *  ASIC3 buttons
@@ -274,9 +272,7 @@
 #endif
 	&blueangel_asic3_keys,
 	&blueangel_leds,
-#ifdef CONFIG_BLUEANGEL_PCMCIA
 	&blueangel_pcmcia,
-#endif
 };