diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 20:37:43 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 20:37:43 +0200 |
commit | 696314cf53b7b2d1f91af6da259533eb9611e7bf (patch) | |
tree | 8e1bf5ea4c322f8b6985b1349d768d2837e417db /arch/arm/mach-omap2/Kconfig | |
parent | 419bb4e0641cf7d84b1684b15afdd176f25c7ebe (diff) | |
parent | e9d0b97eef235eccc3df9ddb9895b35c53a8aaa2 (diff) |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into fixes
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 4ae6257b39a..57b66d590c5 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -7,7 +7,6 @@ config ARCH_OMAP2PLUS_TYPICAL default y select AEABI select REGULATOR - select PM select PM_RUNTIME select VFP select NEON if ARCH_OMAP3 || ARCH_OMAP4 |