summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom 'spot' Callaway <tcallawa@redhat.com>2004-01-04 19:27:49 -0800
committerKeith M. Wesolowski <wesolows@foobazco.org>2004-01-04 19:27:49 -0800
commitba628267e7c7b3411ed7e01fd89f3bcd0b548f3c (patch)
tree98ec1d362b7581690ad55bb377cffee14e8166a2
parent5d65805989856b0f3ddd4e512e0dad1cfa0a330d (diff)
[SPARC64]: Fix sun_uflash MTD driver build.
-rw-r--r--drivers/mtd/chips/jedec_probe.c1
-rw-r--r--drivers/mtd/maps/sun_uflash.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index ce539ba17a27..7e471fe1d980 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -16,6 +16,7 @@
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
+#include <linux/init.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 828288642f7c..b676e05542fd 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -95,8 +95,8 @@ int uflash_devinit(struct linux_ebus_device* edev)
if(0 != pdev->name && 0 < strlen(pdev->name)) {
pdev->map.name = pdev->name;
}
- pdev->phys = edev->resource[0].start;
- pdev->virt =
+ pdev->map.phys = edev->resource[0].start;
+ pdev->map.virt =
(unsigned long)ioremap_nocache(edev->resource[0].start, pdev->map.size);
if(0 == pdev->map.virt) {
printk("%s: failed to map device\n", __FUNCTION__);