diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-08-10 03:36:42 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-08-10 03:36:42 -0700 |
| commit | 58cf5e7fd5554735901dc855f5d4c16c59331dd5 (patch) | |
| tree | 313ed295ec518b7bbc3d3ba952fc4fe430dc2ace /arch/arm/mach-omap2/Kconfig | |
| parent | c9a48c2aac235f7a7e31fb7214a33afcd0da26b7 (diff) | |
| parent | 98333b3dda1e490b02304a6a6643c294d4e520c3 (diff) | |
Merge branch 'for_3.1/pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm 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 |