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 /drivers/pcmcia/pxa2xx_base.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 'drivers/pcmcia/pxa2xx_base.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 874923fcb2f9..e439044d88f2 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | #include <asm/system.h> | 30 | #include <asm/system.h> |
| 31 | #include <asm/arch/pxa-regs.h> | 31 | #include <asm/arch/pxa-regs.h> |
| 32 | #include <asm/arch/pxa2xx-regs.h> | ||
| 32 | 33 | ||
| 33 | #include <pcmcia/cs_types.h> | 34 | #include <pcmcia/cs_types.h> |
| 34 | #include <pcmcia/ss.h> | 35 | #include <pcmcia/ss.h> |