diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 18:21:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 18:21:51 -0500 |
| commit | 29ac878a71d1900cc2e283819b1daa388961ab6e (patch) | |
| tree | 8756008bf1e3b07f2ab6fc6321b494a5eeee63ed /drivers/mtd/nand/h1910.c | |
| parent | 54c4e6b5fee0347ab81e2c2fe4239c455c3422ae (diff) | |
| parent | a6c61e9dfdd0adf8443932cfc43b0c1e25036ad5 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c index 041e4b3358fb..f68f7a99a630 100644 --- a/drivers/mtd/nand/h1910.c +++ b/drivers/mtd/nand/h1910.c | |||
| @@ -112,7 +112,7 @@ static int __init h1910_init (void) | |||
| 112 | if (!machine_is_h1900()) | 112 | if (!machine_is_h1900()) |
| 113 | return -ENODEV; | 113 | return -ENODEV; |
| 114 | 114 | ||
| 115 | nandaddr = __ioremap(0x08000000, 0x1000, 0, 1); | 115 | nandaddr = ioremap(0x08000000, 0x1000); |
| 116 | if (!nandaddr) { | 116 | if (!nandaddr) { |
| 117 | printk("Failed to ioremap nand flash.\n"); | 117 | printk("Failed to ioremap nand flash.\n"); |
| 118 | return -ENOMEM; | 118 | return -ENOMEM; |