diff options
Diffstat (limited to 'drivers/mtd/maps/ocelot.c')
-rw-r--r-- | drivers/mtd/maps/ocelot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/maps/ocelot.c b/drivers/mtd/maps/ocelot.c index 82c3070678c5..6977963d7897 100644 --- a/drivers/mtd/maps/ocelot.c +++ b/drivers/mtd/maps/ocelot.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: ocelot.c,v 1.16 2005/01/05 18:05:13 dwmw2 Exp $ | 2 | * $Id: ocelot.c,v 1.17 2005/11/07 11:14:27 gleixner Exp $ |
3 | * | 3 | * |
4 | * Flash on Momenco Ocelot | 4 | * Flash on Momenco Ocelot |
5 | */ | 5 | */ |
@@ -31,7 +31,7 @@ static void ocelot_ram_write(struct mtd_info *mtd, loff_t to, size_t len, size_t | |||
31 | struct map_info *map = mtd->priv; | 31 | struct map_info *map = mtd->priv; |
32 | size_t done = 0; | 32 | size_t done = 0; |
33 | 33 | ||
34 | /* If we use memcpy, it does word-wide writes. Even though we told the | 34 | /* If we use memcpy, it does word-wide writes. Even though we told the |
35 | GT64120A that it's an 8-bit wide region, word-wide writes don't work. | 35 | GT64120A that it's an 8-bit wide region, word-wide writes don't work. |
36 | We end up just writing the first byte of the four to all four bytes. | 36 | We end up just writing the first byte of the four to all four bytes. |
37 | So we have this loop instead */ | 37 | So we have this loop instead */ |
@@ -68,7 +68,7 @@ static int __init init_ocelot_maps(void) | |||
68 | int nr_parts; | 68 | int nr_parts; |
69 | unsigned char brd_status; | 69 | unsigned char brd_status; |
70 | 70 | ||
71 | printk(KERN_INFO "Momenco Ocelot MTD mappings: Flash 0x%x at 0x%x, NVRAM 0x%x at 0x%x\n", | 71 | printk(KERN_INFO "Momenco Ocelot MTD mappings: Flash 0x%x at 0x%x, NVRAM 0x%x at 0x%x\n", |
72 | FLASH_WINDOW_SIZE, FLASH_WINDOW_ADDR, NVRAM_WINDOW_SIZE, NVRAM_WINDOW_ADDR); | 72 | FLASH_WINDOW_SIZE, FLASH_WINDOW_ADDR, NVRAM_WINDOW_SIZE, NVRAM_WINDOW_ADDR); |
73 | 73 | ||
74 | /* First check whether the flash jumper is present */ | 74 | /* First check whether the flash jumper is present */ |
@@ -138,8 +138,8 @@ static int __init init_ocelot_maps(void) | |||
138 | add_mtd_device(flash_mtd); | 138 | add_mtd_device(flash_mtd); |
139 | 139 | ||
140 | return 0; | 140 | return 0; |
141 | 141 | ||
142 | fail3: | 142 | fail3: |
143 | iounmap((void *)ocelot_flash_map.virt); | 143 | iounmap((void *)ocelot_flash_map.virt); |
144 | if (ocelot_flash_map.cached) | 144 | if (ocelot_flash_map.cached) |
145 | iounmap((void *)ocelot_flash_map.cached); | 145 | iounmap((void *)ocelot_flash_map.cached); |