From 5ccd49e22d5913b5bd9754399f51d68c5935a5d2 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 31 Oct 2012 09:54:56 -0700 Subject: [PATCH] --- yaml --- r: 339707 b: refs/heads/master c: 873e698067cfa21420576632e1c3387c0f90ce4a h: refs/heads/master i: 339705: b87114296bd35cf751c64dd4ce4724a6c86cb80b 339703: a56ba05646fec8ebb3c2ec71f200a107711c7aa5 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 - trunk/arch/arm/mach-omap1/gpio15xx.c | 2 ++ trunk/arch/arm/mach-omap1/gpio16xx.c | 2 ++ trunk/arch/arm/mach-omap1/gpio7xx.c | 2 ++ trunk/arch/arm/mach-omap1/include/mach/gpio.h | 3 --- trunk/arch/arm/mach-omap2/include/mach/gpio.h | 3 --- trunk/include/linux/platform_data/gpio-omap.h | 1 - trunk/sound/soc/omap/am3517evm.c | 2 -- trunk/sound/soc/omap/n810.c | 1 - trunk/sound/soc/omap/osk5912.c | 1 - trunk/sound/soc/omap/sdp3430.c | 2 -- trunk/sound/soc/omap/zoom2.c | 3 --- 13 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 trunk/arch/arm/mach-omap1/include/mach/gpio.h delete mode 100644 trunk/arch/arm/mach-omap2/include/mach/gpio.h diff --git a/[refs] b/[refs] index 92160734951e..d0adfe96c520 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7136f8d88c08f18158b63777fb270b62788ed169 +refs/heads/master: 873e698067cfa21420576632e1c3387c0f90ce4a diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 73067efd4845..6207cf734b2b 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -937,7 +937,6 @@ config ARCH_OMAP select CLKSRC_MMIO select GENERIC_CLOCKEVENTS select HAVE_CLK - select NEED_MACH_GPIO_H help Support for TI's OMAP platform (OMAP1/2/3/4). diff --git a/trunk/arch/arm/mach-omap1/gpio15xx.c b/trunk/arch/arm/mach-omap1/gpio15xx.c index 98e6f39224a4..02b3eb2e201c 100644 --- a/trunk/arch/arm/mach-omap1/gpio15xx.c +++ b/trunk/arch/arm/mach-omap1/gpio15xx.c @@ -19,6 +19,8 @@ #include #include +#include + #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE #define OMAP1510_GPIO_BASE 0xFFFCE000 diff --git a/trunk/arch/arm/mach-omap1/gpio16xx.c b/trunk/arch/arm/mach-omap1/gpio16xx.c index 33f419236b17..b9952a258d82 100644 --- a/trunk/arch/arm/mach-omap1/gpio16xx.c +++ b/trunk/arch/arm/mach-omap1/gpio16xx.c @@ -19,6 +19,8 @@ #include #include +#include + #define OMAP1610_GPIO1_BASE 0xfffbe400 #define OMAP1610_GPIO2_BASE 0xfffbec00 #define OMAP1610_GPIO3_BASE 0xfffbb400 diff --git a/trunk/arch/arm/mach-omap1/gpio7xx.c b/trunk/arch/arm/mach-omap1/gpio7xx.c index 958ce9acee95..f5819b2b7cbe 100644 --- a/trunk/arch/arm/mach-omap1/gpio7xx.c +++ b/trunk/arch/arm/mach-omap1/gpio7xx.c @@ -19,6 +19,8 @@ #include #include +#include + #define OMAP7XX_GPIO1_BASE 0xfffbc000 #define OMAP7XX_GPIO2_BASE 0xfffbc800 #define OMAP7XX_GPIO3_BASE 0xfffbd000 diff --git a/trunk/arch/arm/mach-omap1/include/mach/gpio.h b/trunk/arch/arm/mach-omap1/include/mach/gpio.h deleted file mode 100644 index ebf86c0f4f46..000000000000 --- a/trunk/arch/arm/mach-omap1/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * arch/arm/mach-omap1/include/mach/gpio.h - */ diff --git a/trunk/arch/arm/mach-omap2/include/mach/gpio.h b/trunk/arch/arm/mach-omap2/include/mach/gpio.h deleted file mode 100644 index 5621cc59c9f4..000000000000 --- a/trunk/arch/arm/mach-omap2/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * arch/arm/mach-omap2/include/mach/gpio.h - */ diff --git a/trunk/include/linux/platform_data/gpio-omap.h b/trunk/include/linux/platform_data/gpio-omap.h index e8741c2678d5..5d50b25a73d7 100644 --- a/trunk/include/linux/platform_data/gpio-omap.h +++ b/trunk/include/linux/platform_data/gpio-omap.h @@ -26,7 +26,6 @@ #include #include -#include #define OMAP1_MPUIO_BASE 0xfffb5000 diff --git a/trunk/sound/soc/omap/am3517evm.c b/trunk/sound/soc/omap/am3517evm.c index fad350682ca2..c1900b2a6f28 100644 --- a/trunk/sound/soc/omap/am3517evm.c +++ b/trunk/sound/soc/omap/am3517evm.c @@ -25,8 +25,6 @@ #include #include -#include -#include #include #include "omap-mcbsp.h" diff --git a/trunk/sound/soc/omap/n810.c b/trunk/sound/soc/omap/n810.c index 521bfc3d2b2b..230b8c144848 100644 --- a/trunk/sound/soc/omap/n810.c +++ b/trunk/sound/soc/omap/n810.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include diff --git a/trunk/sound/soc/omap/osk5912.c b/trunk/sound/soc/omap/osk5912.c index 3960e8df9c76..06ef8d67ed1c 100644 --- a/trunk/sound/soc/omap/osk5912.c +++ b/trunk/sound/soc/omap/osk5912.c @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/trunk/sound/soc/omap/sdp3430.c b/trunk/sound/soc/omap/sdp3430.c index 597cae769cea..b462a2c9385f 100644 --- a/trunk/sound/soc/omap/sdp3430.c +++ b/trunk/sound/soc/omap/sdp3430.c @@ -31,8 +31,6 @@ #include #include -#include -#include #include #include diff --git a/trunk/sound/soc/omap/zoom2.c b/trunk/sound/soc/omap/zoom2.c index 677b567935f8..27c501c301b7 100644 --- a/trunk/sound/soc/omap/zoom2.c +++ b/trunk/sound/soc/omap/zoom2.c @@ -26,9 +26,6 @@ #include #include -#include -#include -#include #include /* Register descriptions for twl4030 codec part */