From ae0708de29106bae5014036cac757d240a3e5d52 Mon Sep 17 00:00:00 2001
From: Francisco Alecrim <francisco.alecrim@indt.org.br>
Date: Fri, 14 Dec 2007 10:49:24 -0400
Subject: [PATCH] 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>
---
 arch/arm/mach-omap1/board-nokia770.c | 2 --
 arch/arm/mach-omap1/board-osk.c      | 1 -
 arch/arm/mach-omap1/board-palmtt.c   | 1 -
 arch/arm/mach-omap1/board-palmz71.c  | 1 -
 arch/arm/mach-omap2/pm.c             | 1 -
 5 files changed, 6 deletions(-)

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 54502b12339..194db4c9dbc 100644
--- 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 7d2f21eeb0f..db3f14a22b2 100644
--- 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 38c9ba95942..ed281b80f1e 100644
--- 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 b2ed1cbd90f..156510777ff 100644
--- 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 1e77957f5bf..d7f2fa0845f 100644
--- 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"
-- 
2.41.1