diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-13 09:53:08 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-13 10:04:52 -0500 |
| commit | d9a682a592ff5905d328c648fd30ee7fa12ce8ab (patch) | |
| tree | 5a6a09c4a9cef6f29dcab95f36db5ac6b6e6578d /drivers/mtd/maps/h720x-flash.c | |
| parent | 1e8b0416ca387d754410a4e5d6b92ad6e2fb00eb (diff) | |
[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mtd/maps/h720x-flash.c')
| -rw-r--r-- | drivers/mtd/maps/h720x-flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c index 35fef655ccc4..3b959fad1c4e 100644 --- a/drivers/mtd/maps/h720x-flash.c +++ b/drivers/mtd/maps/h720x-flash.c | |||
| @@ -24,8 +24,8 @@ static struct mtd_info *mymtd; | |||
| 24 | static struct map_info h720x_map = { | 24 | static struct map_info h720x_map = { |
| 25 | .name = "H720X", | 25 | .name = "H720X", |
| 26 | .bankwidth = 4, | 26 | .bankwidth = 4, |
| 27 | .size = FLASH_SIZE, | 27 | .size = H720X_FLASH_SIZE, |
| 28 | .phys = FLASH_PHYS, | 28 | .phys = H720X_FLASH_PHYS, |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | static struct mtd_partition h720x_partitions[] = { | 31 | static struct mtd_partition h720x_partitions[] = { |
| @@ -70,7 +70,7 @@ int __init h720x_mtd_init(void) | |||
| 70 | 70 | ||
| 71 | char *part_type = NULL; | 71 | char *part_type = NULL; |
| 72 | 72 | ||
| 73 | h720x_map.virt = ioremap(FLASH_PHYS, FLASH_SIZE); | 73 | h720x_map.virt = ioremap(h720x_map.phys, h720x_map.size); |
| 74 | 74 | ||
| 75 | if (!h720x_map.virt) { | 75 | if (!h720x_map.virt) { |
| 76 | printk(KERN_ERR "H720x-MTD: ioremap failed\n"); | 76 | printk(KERN_ERR "H720x-MTD: ioremap failed\n"); |