diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
| commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
| tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /arch/arm/Kconfig | |
| parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c837293de9dc..d45ca1bf1de0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -924,7 +924,6 @@ config ARCH_OMAP | |||
| 924 | select CLKSRC_MMIO | 924 | select CLKSRC_MMIO |
| 925 | select GENERIC_CLOCKEVENTS | 925 | select GENERIC_CLOCKEVENTS |
| 926 | select HAVE_CLK | 926 | select HAVE_CLK |
| 927 | select NEED_MACH_GPIO_H | ||
| 928 | help | 927 | help |
| 929 | Support for TI's OMAP platform (OMAP1/2/3/4). | 928 | Support for TI's OMAP platform (OMAP1/2/3/4). |
| 930 | 929 | ||