summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2005-11-07 08:09:05 +0000
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-11-07 10:44:15 +0100
commitea17629f3e6f64591a98a9049a0d725d2672509c (patch)
tree0a2dbc541c7f37d58a989ca7fbfb9ec794075677 /drivers
parent30966174341b3db58dfb77b82193eff7f5644a97 (diff)
downloadlinux-ea17629f3e6f64591a98a9049a0d725d2672509c.tar.gz
linux-ea17629f3e6f64591a98a9049a0d725d2672509c.tar.bz2
linux-ea17629f3e6f64591a98a9049a0d725d2672509c.zip
[MTD] maps ixp2000: fix compile warnings in ixp2000 map driver
Fix two compile warnings that occur because of treating two 'unsigned long's as 'void *'s. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/maps/ixp2000.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 00b9f67580f1..78c68f49be83 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -1,5 +1,5 @@
/*
- * $Id: ixp2000.c,v 1.6 2005/03/18 14:07:46 gleixner Exp $
+ * $Id: ixp2000.c,v 1.8 2005/11/07 08:09:02 gleixner Exp $
*
* drivers/mtd/maps/ixp2000.c
*
@@ -193,7 +193,7 @@ static int ixp2000_flash_probe(struct device *_dev)
/*
* map_priv_2 is used to store a ptr to to the bank_setup routine
*/
- info->map.map_priv_2 = (void __iomem *) ixp_data->bank_setup;
+ info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup;
info->map.name = dev->dev.bus_id;
info->map.read = ixp2000_flash_read8;
@@ -210,7 +210,7 @@ static int ixp2000_flash_probe(struct device *_dev)
goto Error;
}
- info->map.map_priv_1 = ioremap(dev->resource->start,
+ info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
dev->resource->end - dev->resource->start + 1);
if (!info->map.map_priv_1) {
dev_err(_dev, "Failed to ioremap flash region\n");