git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
ocelot.c
diff --git
a/drivers/mtd/maps/ocelot.c
b/drivers/mtd/maps/ocelot.c
index
40c524d
..
82c3070
100644
(file)
--- a/
drivers/mtd/maps/ocelot.c
+++ b/
drivers/mtd/maps/ocelot.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: ocelot.c,v 1.1
3 2004/07/12 21:59:44
dwmw2 Exp $
+ * $Id: ocelot.c,v 1.1
6 2005/01/05 18:05:13
dwmw2 Exp $
*
* Flash on Momenco Ocelot
*/
*
* Flash on Momenco Ocelot
*/
@@
-28,7
+28,7
@@
static struct mtd_info *nvram_mtd;
static void ocelot_ram_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
{
static void ocelot_ram_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
{
- struct map_info *map =
(struct map_info *)
mtd->priv;
+ struct map_info *map = mtd->priv;
size_t done = 0;
/* If we use memcpy, it does word-wide writes. Even though we told the
size_t done = 0;
/* If we use memcpy, it does word-wide writes. Even though we told the
@@
-81,7
+81,7
@@
static int __init init_ocelot_maps(void)
iounmap(pld);
/* Now ioremap the NVRAM space */
iounmap(pld);
/* Now ioremap the NVRAM space */
- ocelot_nvram_map.virt =
(unsigned long)
ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
+ ocelot_nvram_map.virt = ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
if (!ocelot_nvram_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Ocelot NVRAM space\n");
return -EIO;
if (!ocelot_nvram_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Ocelot NVRAM space\n");
return -EIO;
@@
-101,7
+101,7
@@
static int __init init_ocelot_maps(void)
nvram_mtd->write = ocelot_ram_write;
/* Now map the flash space */
nvram_mtd->write = ocelot_ram_write;
/* Now map the flash space */
- ocelot_flash_map.virt =
(unsigned long)
ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
+ ocelot_flash_map.virt = ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
if (!ocelot_flash_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Ocelot flash space\n");
goto fail_2;
if (!ocelot_flash_map.virt) {
printk(KERN_NOTICE "Failed to ioremap Ocelot flash space\n");
goto fail_2;