mtd/drivers/mtd/maps sa1100-flash.c,1.41,1.42

Russell King rmk at infradead.org
Thu Oct 21 08:15:38 EDT 2004


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

Modified Files:
	sa1100-flash.c 
Log Message:
MTD CVS needs to be kept straight with mainline kernel trees, not with
handhelds.org CVS repository.  Since mainline still uses "machine_is_h3xxx"
rather than "machine_is_ipaq", back out this change.  Sorry.


Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sa1100-flash.c	16 Sep 2004 23:27:13 -0000	1.41
+++ sa1100-flash.c	21 Oct 2004 12:15:35 -0000	1.42
@@ -1192,7 +1192,7 @@
 		info[0].size = SZ_16M;
 		nr = 1;
 	}
-	if (machine_is_ipaq()) {
+	if (machine_is_h3xxx()) {
 		info[0].set_vpp = h3xxx_set_vpp;
 		info[0].base = SA1100_CS0_PHYS;
 		info[0].size = SZ_32M;





More information about the linux-mtd-cvs mailing list