mtd/drivers/mtd/maps sun_uflash.c,1.7,1.8

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv24872

Modified Files:
	sun_uflash.c 
Log Message:
Merge from 2.6: don't include version.h, compile fixes


Index: sun_uflash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sun_uflash.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sun_uflash.c	20 May 2003 20:59:32 -0000	1.7
+++ sun_uflash.c	12 Jul 2004 14:45:36 -0000	1.8
@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -96,8 +95,8 @@
 	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__);