commit 8785a8fbd5a1624dbabd7c782524450e902b722e
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon Jan 14 17:02:33 2008 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat Jan 26 15:07:54 2008 +0000
tree 168c4819eb334c6b8674aaf6e276350ef7ac31c6
parent 7664c400cc994542a27d1bacde54673880e7e179

[ARM] pxa: move memory controller registers into pxa2xx-regs.h

PXA3 has a different memory controller from PXA2 platforms.  Avoid
clashing definitions by moving the PXA2 definitions to pxa2xx-regs.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

drivers/pcmcia/pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 874923f..e439044 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -29,6 +29,7 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>