diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 10:25:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 10:25:25 -0400 |
| commit | 14d188bbac664f58c4c3b144a4b28ff5bb889425 (patch) | |
| tree | 5c386b0e93c8f1de496d03db0a98aaaad63c1e94 /arch/arm/mach-omap2/Kconfig | |
| parent | d323c243d9e6d9bab8b69ee44bfc2ebba11b9786 (diff) | |
| parent | 12ac7f9e117facfe128d6e569953fa73d2d676b3 (diff) | |
Merge tag 'omap-for-v3.7-rc2/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren <tony@atomide.com>:
Timer fix for am33xx, runtime PM fix for UART, audio McBSP fixes,
mux and pinctrl fixes, and Beagle OPP fix.
* tag 'omap-for-v3.7-rc2/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: AM33XX: Fix configuration of dmtimer parent clock by dmtimer driverDate:Wed, 17 Oct 2012 13:55:55 -0500
ARM: OMAP3: Beagle: fix OPP customization and initcall ordering
ARM: OMAP3: Fix 3430 legacy mux names for ssi1 signals.
ARM: OMAP2+: Fix location of select PINCTRL
ARM/dts: omap3: Fix mcbsp2/3 hwmods to be able to probe the drivers for audio
ARM: OMAP2: UART: fix console UART mismatched runtime PM status
ARM: OMAP3: PM: apply part of the erratum i582 workaround
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 2a1a898c7f90..d669e227e00c 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -11,7 +11,6 @@ config ARCH_OMAP2PLUS_TYPICAL | |||
| 11 | select I2C_OMAP | 11 | select I2C_OMAP |
| 12 | select MENELAUS if ARCH_OMAP2 | 12 | select MENELAUS if ARCH_OMAP2 |
| 13 | select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 | 13 | select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 |
| 14 | select PINCTRL | ||
| 15 | select PM_RUNTIME | 14 | select PM_RUNTIME |
| 16 | select REGULATOR | 15 | select REGULATOR |
| 17 | select SERIAL_OMAP | 16 | select SERIAL_OMAP |