diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /drivers/mtd/maps/h720x-flash.c | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
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"); |