clean-up: remove duplicate headers in OMAP

Removing duplicate headers in OMAP:
arch/arm/mach-omap1/board-palmtt.c: linux/input.h is included more than once.
arch/arm/mach-omap1/board-osk.c: linux/interrupt.h is included more than once.
arch/arm/mach-omap1/board-palmz71.c: linux/input.h is included more than once.
arch/arm/mach-omap1/board-nokia770.c: asm/arch/dsp_common.h is included more than once.
arch/arm/mach-omap1/board-nokia770.c: asm/arch/gpio.h is included more than once.
arch/arm/mach-omap2/pm.c: asm/arch/gpio.h is included more than once.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 54502b12339c7b2747eb8cefc72d45c652708eae..194db4c9dbce3b21d04f6f0fa577e3ffa31efd65 100644 (file)
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -32,11 +32,9 @@
 #include <asm/arch/common.h>
 #include <asm/arch/dsp_common.h>
 #include <asm/arch/aic23.h>
-#include <asm/arch/gpio.h>
 #include <asm/arch/omapfb.h>
 #include <asm/arch/hwa742.h>
 #include <asm/arch/lcd_mipid.h>
-#include <asm/arch/dsp_common.h>
 
 #define ADS7846_PENDOWN_GPIO   15
 

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 7d2f21eeb0f9809cdd36751e50eeac1e5420aeca..db3f14a22b2ab579c97b5c0693220facbd1b12f8 100644 (file)
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -31,7 +31,6 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/interrupt.h>
 #include <linux/i2c.h>
 
 #include <linux/mtd/mtd.h>

diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 38c9ba95942fc6a1e25df6735bc444e4a904e868..ed281b80f1e8b22f74b58dcaa9d9639d4ff03c08 100644 (file)
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -42,7 +42,6 @@
 #include <asm/arch/common.h>
 #include <asm/arch/omap-alsa.h>
 
-#include <linux/input.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 

diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index b2ed1cbd90f9da953240147ad602eec3cf35bb75..156510777ffe569be987480be3197dbd92e01c80 100644 (file)
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -44,7 +44,6 @@
 #include <asm/arch/common.h>
 #include <asm/arch/omap-alsa.h>
 
-#include <linux/input.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 1e77957f5bf90455415d4a0c5e6921da8f18bee9..d7f2fa0845faa697c41e93fcaf3bc1d231b6cc6e 100644 (file)
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -44,7 +44,6 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
 
 #include "prm.h"
 #include "prm_regbits_24xx.h"