diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:09:41 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:09:41 -0500 |
| commit | b1f71bd0328a8c928258d3c8be689ddbc13a8a3b (patch) | |
| tree | ed0f0b21ed9ab96a1bfca107cbe37e0692d12d4e /arch/arm/Kconfig | |
| parent | 591d07bf13a009315340d4b65c7ffef6aaed6bca (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap/headers4' into next/dt
These changes are needed for the following omap DT changes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 ade7e924bef5..041cf0774776 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -937,7 +937,6 @@ config ARCH_OMAP | |||
| 937 | select CLKSRC_MMIO | 937 | select CLKSRC_MMIO |
| 938 | select GENERIC_CLOCKEVENTS | 938 | select GENERIC_CLOCKEVENTS |
| 939 | select HAVE_CLK | 939 | select HAVE_CLK |
| 940 | select NEED_MACH_GPIO_H | ||
| 941 | help | 940 | help |
| 942 | Support for TI's OMAP platform (OMAP1/2/3/4). | 941 | Support for TI's OMAP platform (OMAP1/2/3/4). |
| 943 | 942 | ||