aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2005-11-07 03:09:05 -0500
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-11-07 04:44:15 -0500
commitea17629f3e6f64591a98a9049a0d725d2672509c (patch)
tree0a2dbc541c7f37d58a989ca7fbfb9ec794075677 /drivers/mtd
parent30966174341b3db58dfb77b82193eff7f5644a97 (diff)
[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/mtd')
-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 @@
1/* 1/*
2 * $Id: ixp2000.c,v 1.6 2005/03/18 14:07:46 gleixner Exp $ 2 * $Id: ixp2000.c,v 1.8 2005/11/07 08:09:02 gleixner Exp $
3 * 3 *
4 * drivers/mtd/maps/ixp2000.c 4 * drivers/mtd/maps/ixp2000.c
5 * 5 *
@@ -193,7 +193,7 @@ static int ixp2000_flash_probe(struct device *_dev)
193 /* 193 /*
194 * map_priv_2 is used to store a ptr to to the bank_setup routine 194 * map_priv_2 is used to store a ptr to to the bank_setup routine
195 */ 195 */
196 info->map.map_priv_2 = (void __iomem *) ixp_data->bank_setup; 196 info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup;
197 197
198 info->map.name = dev->dev.bus_id; 198 info->map.name = dev->dev.bus_id;
199 info->map.read = ixp2000_flash_read8; 199 info->map.read = ixp2000_flash_read8;
@@ -210,7 +210,7 @@ static int ixp2000_flash_probe(struct device *_dev)
210 goto Error; 210 goto Error;
211 } 211 }
212 212
213 info->map.map_priv_1 = ioremap(dev->resource->start, 213 info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
214 dev->resource->end - dev->resource->start + 1); 214 dev->resource->end - dev->resource->start + 1);
215 if (!info->map.map_priv_1) { 215 if (!info->map.map_priv_1) {
216 dev_err(_dev, "Failed to ioremap flash region\n"); 216 dev_err(_dev, "Failed to ioremap flash region\n");