diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-01-14 12:02:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-26 10:07:54 -0500 |
| commit | 8785a8fbd5a1624dbabd7c782524450e902b722e (patch) | |
| tree | 168c4819eb334c6b8674aaf6e276350ef7ac31c6 /arch/arm/mach-pxa/mainstone.c | |
| parent | 7664c400cc994542a27d1bacde54673880e7e179 (diff) | |
[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/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 237459bf67c6..06e13608a2c9 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <asm/mach/flash.h> | 39 | #include <asm/mach/flash.h> |
| 40 | 40 | ||
| 41 | #include <asm/arch/pxa-regs.h> | 41 | #include <asm/arch/pxa-regs.h> |
| 42 | #include <asm/arch/pxa2xx-regs.h> | ||
| 42 | #include <asm/arch/mainstone.h> | 43 | #include <asm/arch/mainstone.h> |
| 43 | #include <asm/arch/audio.h> | 44 | #include <asm/arch/audio.h> |
| 44 | #include <asm/arch/pxafb.h> | 45 | #include <asm/arch/pxafb.h> |