ARM: OMAP: Clean up header file duplication

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

ARM: OMAP: Clean up header file duplication
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
76ae0ac8 · Hiroshi DOYU · Tony Lindgren · 1c957036 · 76ae0ac8 · 76ae0ac8
Commit 76ae0ac8 authored Sep 15, 2008 by Hiroshi DOYU Committed by Tony Lindgren Oct 06, 2008
11 changed files
--- 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)


--- 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)


--- 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>


--- 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>

--- 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)


--- 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>

--- 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>

--- 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>

--- 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"

--- 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>

--- 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>