Merge branch 'master' of git://git.marvell.com/orion into devel

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / pxa2xx_cm_x270.c

diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index 6c3aac3771260202e6c05325bc180ac9c64f32e4..a7b943d01e34a85a0e27897f55eec9ba1670b853 100644 (file)
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -16,7 +16,6 @@
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
-#include <mach/pxa-regs.h>
 
 #include "soc_common.h"