summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/h1910.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 15:21:51 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 15:21:51 -0800
commit29ac878a71d1900cc2e283819b1daa388961ab6e (patch)
tree8756008bf1e3b07f2ab6fc6321b494a5eeee63ed /drivers/mtd/nand/h1910.c
parent54c4e6b5fee0347ab81e2c2fe4239c455c3422ae (diff)
parenta6c61e9dfdd0adf8443932cfc43b0c1e25036ad5 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/mtd/nand/h1910.c')
-rw-r--r--drivers/mtd/nand/h1910.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 041e4b3358f..f68f7a99a63 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -112,7 +112,7 @@ static int __init h1910_init (void)
if (!machine_is_h1900())
return -ENODEV;
- nandaddr = __ioremap(0x08000000, 0x1000, 0, 1);
+ nandaddr = ioremap(0x08000000, 0x1000);
if (!nandaddr) {
printk("Failed to ioremap nand flash.\n");
return -ENOMEM;