summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/lubbock.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-01-14 17:02:33 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 15:07:54 +0000
commit8785a8fbd5a1624dbabd7c782524450e902b722e (patch)
tree168c4819eb334c6b8674aaf6e276350ef7ac31c6 /arch/arm/mach-pxa/lubbock.c
parent7664c400cc994542a27d1bacde54673880e7e179 (diff)
downloadblackbird-op-linux-8785a8fbd5a1624dbabd7c782524450e902b722e.tar.gz
blackbird-op-linux-8785a8fbd5a1624dbabd7c782524450e902b722e.zip
[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>
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
-rw-r--r--arch/arm/mach-pxa/lubbock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 1b9290c0ed5e..a75594bf68b5 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -41,6 +41,7 @@
#include <asm/hardware/sa1111.h>
#include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h>
#include <asm/arch/lubbock.h>
#include <asm/arch/udc.h>
#include <asm/arch/irda.h>
OpenPOWER on IntegriCloud