mtd/drivers/mtd/maps bast-flash.c, 1.3, 1.4 ceiva.c, 1.11,
1.12 dc21285.c, 1.22, 1.23 dilnetpc.c, 1.18,
1.19 epxa10db-flash.c, 1.13, 1.14 fortunet.c, 1.9,
1.10 integrator-flash.c, 1.18, 1.19 ixp2000.c, 1.6,
1.7 ixp4xx.c, 1.10, 1.11 lubbock-flash.c, 1.19,
1.20 mainstone-flash.c, 1.2, 1.3 omap-toto-flash.c, 1.3,
1.4 omap_nor.c, 1.1, 1.2 pci.c, 1.11, 1.12 plat-ram.c, 1.4,
1.5 tqm8xxl.c, 1.13, 1.14
gleixner at infradead.org
gleixner at infradead.org
Sun Nov 6 06:15:54 EST 2005
Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv22248/drivers/mtd/maps
Modified Files:
bast-flash.c ceiva.c dc21285.c dilnetpc.c epxa10db-flash.c
fortunet.c integrator-flash.c ixp2000.c ixp4xx.c
lubbock-flash.c mainstone-flash.c omap-toto-flash.c omap_nor.c
pci.c plat-ram.c tqm8xxl.c
Log Message:
Mainline sync. include cleanup
Index: bast-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/bast-flash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bast-flash.c 10 Oct 2005 00:13:38 -0000 1.3
+++ bast-flash.c 6 Nov 2005 11:15:51 -0000 1.4
@@ -33,13 +33,13 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/device.h>
-
+#include <linux/slab.h>
+#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <asm/io.h>
-#include <asm/mach-types.h>
#include <asm/mach/flash.h>
#include <asm/arch/map.h>
Index: ceiva.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ceiva.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ceiva.c 16 Sep 2004 23:27:12 -0000 1.11
+++ ceiva.c 6 Nov 2005 11:15:51 -0000 1.12
@@ -20,6 +20,7 @@
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
Index: dc21285.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dc21285.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dc21285.c 1 Nov 2004 13:39:21 -0000 1.22
+++ dc21285.c 6 Nov 2005 11:15:51 -0000 1.23
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
Index: dilnetpc.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dilnetpc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dilnetpc.c 12 Jan 2005 22:34:35 -0000 1.18
+++ dilnetpc.c 6 Nov 2005 11:15:51 -0000 1.19
@@ -30,12 +30,15 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/concat.h>
+#include <asm/io.h>
+
/*
** The DIL/NetPC keeps its BIOS in two distinct flash blocks.
** Destroying any of these blocks transforms the DNPC into
Index: epxa10db-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/epxa10db-flash.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- epxa10db-flash.c 4 Nov 2004 13:24:14 -0000 1.13
+++ epxa10db-flash.c 6 Nov 2005 11:15:51 -0000 1.14
@@ -27,12 +27,15 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+#include <asm/io.h>
#include <asm/hardware.h>
+
#ifdef CONFIG_EPXA10DB
#define BOARD_NAME "EPXA10DB"
#else
Index: fortunet.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/fortunet.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fortunet.c 4 Nov 2004 13:24:14 -0000 1.9
+++ fortunet.c 6 Nov 2005 11:15:51 -0000 1.10
@@ -7,11 +7,14 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+
#define MAX_NUM_REGIONS 4
#define MAX_NUM_PARTITIONS 8
Index: integrator-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/integrator-flash.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- integrator-flash.c 1 Nov 2004 13:26:15 -0000 1.18
+++ integrator-flash.c 6 Nov 2005 11:15:51 -0000 1.19
@@ -32,7 +32,7 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/ioport.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/mtd/mtd.h>
Index: ixp2000.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ixp2000.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ixp2000.c 18 Mar 2005 14:07:46 -0000 1.6
+++ ixp2000.c 6 Nov 2005 11:15:51 -0000 1.7
@@ -22,15 +22,17 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
#include <asm/io.h>
#include <asm/hardware.h>
-#include <asm/mach-types.h>
#include <asm/mach/flash.h>
#include <linux/reboot.h>
Index: ixp4xx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ixp4xx.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ixp4xx.c 1 Nov 2005 16:46:15 -0000 1.10
+++ ixp4xx.c 6 Nov 2005 11:15:51 -0000 1.11
@@ -20,13 +20,16 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
+
#include <asm/io.h>
-#include <asm/mach-types.h>
#include <asm/mach/flash.h>
#include <linux/reboot.h>
Index: lubbock-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/lubbock-flash.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lubbock-flash.c 4 Nov 2004 13:24:15 -0000 1.19
+++ lubbock-flash.c 6 Nov 2005 11:15:51 -0000 1.20
@@ -15,10 +15,13 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/slab.h>
+
#include <linux/dma-mapping.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
Index: mainstone-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/mainstone-flash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mainstone-flash.c 1 Jul 2005 22:55:20 -0000 1.2
+++ mainstone-flash.c 6 Nov 2005 11:15:51 -0000 1.3
@@ -16,9 +16,12 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
Index: omap-toto-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/omap-toto-flash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- omap-toto-flash.c 16 Sep 2004 23:27:13 -0000 1.3
+++ omap-toto-flash.c 6 Nov 2005 11:15:51 -0000 1.4
@@ -12,9 +12,9 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-
#include <linux/errno.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
Index: omap_nor.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/omap_nor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- omap_nor.c 2 Jul 2005 01:53:24 -0000 1.1
+++ omap_nor.c 6 Nov 2005 11:15:51 -0000 1.2
@@ -30,19 +30,20 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/ioport.h>
+#include <linux/slab.h>
+
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <asm/io.h>
#include <asm/hardware.h>
-#include <asm/mach-types.h>
#include <asm/mach/flash.h>
#include <asm/arch/tc.h>
Index: pci.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/pci.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pci.c 20 May 2005 16:29:05 -0000 1.11
+++ pci.c 6 Nov 2005 11:15:51 -0000 1.12
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
Index: plat-ram.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/plat-ram.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plat-ram.c 10 Oct 2005 00:51:26 -0000 1.4
+++ plat-ram.c 6 Nov 2005 11:15:51 -0000 1.5
@@ -30,6 +30,8 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
Index: tqm8xxl.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/tqm8xxl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tqm8xxl.c 20 Oct 2004 22:21:53 -0000 1.13
+++ tqm8xxl.c 6 Nov 2005 11:15:51 -0000 1.14
@@ -27,12 +27,14 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+
#define FLASH_ADDR 0x40000000
#define FLASH_SIZE 0x00800000
#define FLASH_BANK_MAX 4
More information about the linux-mtd-cvs
mailing list