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>

arch/arm/mach-pxa/sleep.S

diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index d044772..f33d0c4 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -16,6 +16,7 @@
 #include <asm/hardware.h>
 
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h>
 
 #define MDREFR_KDIV	0x200a4000	// all banks
 #define CCCR_SLEEP	0x00000107	// L=7 2N=2 A=0 PPDIS=0 CPDIS=0