diff options
Diffstat (limited to 'arch/arm/mach-pxa/palmtx.c')
-rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 2b9e76fc2c90..4e3e45927e95 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -247,7 +247,7 @@ static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd, | |||
247 | unsigned int ctrl) | 247 | unsigned int ctrl) |
248 | { | 248 | { |
249 | struct nand_chip *this = mtd->priv; | 249 | struct nand_chip *this = mtd->priv; |
250 | unsigned long nandaddr = (unsigned long)this->IO_ADDR_W; | 250 | char __iomem *nandaddr = this->IO_ADDR_W; |
251 | 251 | ||
252 | if (cmd == NAND_CMD_NONE) | 252 | if (cmd == NAND_CMD_NONE) |
253 | return; | 253 | return; |
@@ -315,17 +315,17 @@ static inline void palmtx_nand_init(void) {} | |||
315 | ******************************************************************************/ | 315 | ******************************************************************************/ |
316 | static struct map_desc palmtx_io_desc[] __initdata = { | 316 | static struct map_desc palmtx_io_desc[] __initdata = { |
317 | { | 317 | { |
318 | .virtual = PALMTX_PCMCIA_VIRT, | 318 | .virtual = (unsigned long)PALMTX_PCMCIA_VIRT, |
319 | .pfn = __phys_to_pfn(PALMTX_PCMCIA_PHYS), | 319 | .pfn = __phys_to_pfn(PALMTX_PCMCIA_PHYS), |
320 | .length = PALMTX_PCMCIA_SIZE, | 320 | .length = PALMTX_PCMCIA_SIZE, |
321 | .type = MT_DEVICE, | 321 | .type = MT_DEVICE, |
322 | }, { | 322 | }, { |
323 | .virtual = PALMTX_NAND_ALE_VIRT, | 323 | .virtual = (unsigned long)PALMTX_NAND_ALE_VIRT, |
324 | .pfn = __phys_to_pfn(PALMTX_NAND_ALE_PHYS), | 324 | .pfn = __phys_to_pfn(PALMTX_NAND_ALE_PHYS), |
325 | .length = SZ_1M, | 325 | .length = SZ_1M, |
326 | .type = MT_DEVICE, | 326 | .type = MT_DEVICE, |
327 | }, { | 327 | }, { |
328 | .virtual = PALMTX_NAND_CLE_VIRT, | 328 | .virtual = (unsigned long)PALMTX_NAND_CLE_VIRT, |
329 | .pfn = __phys_to_pfn(PALMTX_NAND_CLE_PHYS), | 329 | .pfn = __phys_to_pfn(PALMTX_NAND_CLE_PHYS), |
330 | .length = SZ_1M, | 330 | .length = SZ_1M, |
331 | .type = MT_DEVICE, | 331 | .type = MT_DEVICE, |