From 76ae0ac8ed3111770043bed3470f972056ddc9a2 Mon Sep 17 00:00:00 2001
From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Date: Mon, 15 Sep 2008 06:02:13 +0300
Subject: [PATCH] ARM: OMAP: Clean up header file duplication

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/board-h2-mmc.c     | 1 -
 arch/arm/mach-omap1/board-h3-mmc.c     | 1 -
 arch/arm/mach-omap1/board-h3.c         | 1 -
 arch/arm/mach-omap2/board-h4.c         | 1 -
 arch/arm/mach-omap2/board-n800-mmc.c   | 1 -
 arch/arm/mach-omap2/board-omap3evm.c   | 1 -
 drivers/input/keyboard/innovator_ps2.c | 1 -
 drivers/mtd/nand/omap-hw.c             | 1 -
 drivers/mtd/nand/omap-nand-flash.c     | 2 --
 drivers/mtd/onenand/omap2.c            | 1 -
 sound/oss/omap-audio-tsc2101.c         | 1 -
 11 files changed, 12 deletions(-)

diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index 4cc2d4fff46..409fa56d0a8 100644
--- 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 c906db0ba86..fdfe793d56f 100644
--- 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 c333db18cb1..6706cad78b9 100644
--- 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 c65358b2c2b..733e134fb25 100644
--- 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 2cf8213f729..bcee07d537e 100644
--- 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 a9ff8d18a0a..35380673fcd 100644
--- 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 b3c4a0636b5..5f888393eec 100644
--- 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 1eb19ce0a0b..7eb9894e029 100644
--- 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 63a79682802..6b8fb44573d 100644
--- 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 24dd54f31bd..a9885d1e932 100644
--- 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 9cbb0e82139..4931ecf93dc 100644
--- 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>
-- 
2.41.0