aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/viper.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-01-19 04:34:27 -0500
committerEric Miao <eric.miao@marvell.com>2009-03-09 09:22:39 -0400
commitb393c69652333be31ad7a8205761c0d5b7f3e167 (patch)
tree92fb162efe41532bc9867f3f7cf2c269b5ce0129 /arch/arm/mach-pxa/viper.c
parent5742964e916269e01a3467d2bff2601180b7da3d (diff)
[ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c
Move the processor specific initialization (largely resources initialization) out of soc_common_drv_pcmcia_probe() into dedicated sa11xx_drv_pcmcia_probe() and __pxa2xx_drv_pcmcia_probe(). By doing this, we are now able to move the PCMCIA related definitions out of pxa-regs.h and back into pxa2xx_base.c. As a result, remove that reference of _PCMCIA1IO in arch/arm/mach-pxa/viper.c. Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/viper.c')
-rw-r--r--arch/arm/mach-pxa/viper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 03fa5dfa9904..0e65344e9f53 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -953,7 +953,7 @@ static struct map_desc viper_io_desc[] __initdata = {
953 }, 953 },
954 { 954 {
955 .virtual = VIPER_PC104IO_BASE, 955 .virtual = VIPER_PC104IO_BASE,
956 .pfn = __phys_to_pfn(_PCMCIA1IO), 956 .pfn = __phys_to_pfn(0x30000000),
957 .length = 0x00800000, 957 .length = 0x00800000,
958 .type = MT_DEVICE, 958 .type = MT_DEVICE,
959 }, 959 },