diff options
author | Tony Lindgren <tony@atomide.com> | 2011-12-16 14:01:03 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 14:01:03 -0800 |
commit | 7f760f1abcd1a36b52776c90f6a601dd90f06ecb (patch) | |
tree | c5f29a48b528ecc352dbc5c2a246d7860177ac59 /arch/arm/mach-omap2/Kconfig | |
parent | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (diff) | |
parent | da27468655540b083525177f5dc6f3b1f6e3b869 (diff) |
Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 50f43942c1a..a34d0f7d1bf 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -76,8 +76,13 @@ config SOC_OMAP3430 default y select ARCH_OMAP_OTG -config SOC_OMAPTI816X - bool "TI816X support" +config SOC_OMAPTI81XX + bool "TI81XX support" + depends on ARCH_OMAP3 + default y + +config SOC_OMAPAM33XX + bool "AM33XX support" depends on ARCH_OMAP3 default y @@ -314,7 +319,7 @@ config MACH_OMAP_3630SDP config MACH_TI8168EVM bool "TI8168 Evaluation Module" - depends on SOC_OMAPTI816X + depends on SOC_OMAPTI81XX default y config MACH_OMAP_4430SDP |