ARM: OMAP: Clean up header file duplication

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index 4cc2d4fff460af7538ebaa1b355554573fd8c03f..409fa56d0a87dce20d99f2075c6121a2815e26e3 100644 (file)
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -18,7 +18,6 @@
 
 #include <mach/mmc.h>
 #include <mach/gpio.h>
-#include <mach/mmc.h>
 
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 

diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c
index c906db0ba8603a506184fd5f6cd2feac62f6b4b2..fdfe793d56f2893e61d025ab63113846dc3ef51c 100644 (file)
--- a/arch/arm/mach-omap1/board-h3-mmc.c
+++ b/arch/arm/mach-omap1/board-h3-mmc.c
@@ -18,7 +18,6 @@
 
 #include <mach/mmc.h>
 #include <mach/gpio.h>
-#include <mach/mmc.h>
 
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index c333db18cb178f125339220474318b06ad975791..6706cad78b9b876c8129df68b3b9d00a42a92efe 100644 (file)
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -28,7 +28,6 @@
 #include <linux/input.h>
 #include <linux/i2c/tps65010.h>
 #include <linux/clk.h>
-#include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/tsc210x.h>
 

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index c65358b2c2ba61d989f54f73c42c630286497bea..733e134fb256b2fccb93b29280b57b71fce1f67a 100644 (file)
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -18,7 +18,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
-#include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/err.h>
 #include <linux/clk.h>

diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c
index 2cf8213f729c37a4d93a8d19d348bc3b82574969..bcee07d537e0f7e654384bce11a4b7d58e279071 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-mmc.c
+++ b/arch/arm/mach-omap2/board-n800-mmc.c
@@ -17,7 +17,6 @@
 
 #include <mach/mmc.h>
 #include <mach/gpio.h>
-#include <mach/mmc.h>
 
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index a9ff8d18a0afca1c809f67afa0e70b590f54a684..35380673fcd36b75b457ff4fed2ac3c5acb3886e 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -18,7 +18,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/io.h>
 #include <linux/input.h>
 
 #include <linux/i2c/twl4030.h>

diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c
index b3c4a0636b550e293a4dc2386651540934a878b7..5f888393eece56428872a60ac15be76ff250aba8 100644 (file)
--- a/drivers/input/keyboard/innovator_ps2.c
+++ b/drivers/input/keyboard/innovator_ps2.c
@@ -82,7 +82,6 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/delay.h>
-#include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>

diff --git a/drivers/mtd/nand/omap-hw.c b/drivers/mtd/nand/omap-hw.c
index 1eb19ce0a0b6bad744111a8d9a475db5801efc40..7eb9894e0291d5ef97a93e244f40e430cc94e199 100644 (file)
--- a/drivers/mtd/nand/omap-hw.c
+++ b/drivers/mtd/nand/omap-hw.c
@@ -27,7 +27,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/types.h>

diff --git a/drivers/mtd/nand/omap-nand-flash.c b/drivers/mtd/nand/omap-nand-flash.c
index 63a79682802ab4bd6cf7f1323036e87fb7c32429..6b8fb44573d4ae748e56457e01785730a6c153f2 100644 (file)
--- a/drivers/mtd/nand/omap-nand-flash.c
+++ b/drivers/mtd/nand/omap-nand-flash.c
@@ -26,8 +26,6 @@
 #include <asm/mach/flash.h>
 #include <mach/tc.h>
 
-#include <asm/io.h>
-#include <mach/hardware.h>
 #include <mach/nand.h>
 
 #define        DRIVER_NAME     "omapnand"

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 24dd54f31bdcc3743af3427ccd03b8b89523ccbd..a9885d1e9322ea0d43986173e563b1538c85d192 100644 (file)
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -38,7 +38,6 @@
 #include <mach/gpmc.h>
 #include <mach/onenand.h>
 #include <mach/gpio.h>
-#include <mach/gpmc.h>
 #include <mach/pm.h>
 
 #include <linux/dma-mapping.h>

diff --git a/sound/oss/omap-audio-tsc2101.c b/sound/oss/omap-audio-tsc2101.c
index 9cbb0e821399deeee62219f7ae05c6a8c5fbe4ac..4931ecf93dc7fa37ac588879e057249b834aafea 100644 (file)
--- a/sound/oss/omap-audio-tsc2101.c
+++ b/sound/oss/omap-audio-tsc2101.c
@@ -39,7 +39,6 @@
 #include <mach/hardware.h>
 #include <mach/dma.h>
 #include <asm/io.h>
-#include <mach/hardware.h>
 
 #include <mach/mux.h>
 #include <mach/io.h>