Merge branch 'samsung/cleanup' into next/boards

[cascardo/linux.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 4f01533..b740715 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -78,8 +78,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
 
@@ -316,7 +321,12 @@ config MACH_OMAP_3630SDP
 
 config MACH_TI8168EVM
        bool "TI8168 Evaluation Module"
-       depends on SOC_OMAPTI816X
+       depends on SOC_OMAPTI81XX
+       default y
+
+config MACH_TI8148EVM
+       bool "TI8148 Evaluation Module"
+       depends on SOC_OMAPTI81XX
        default y
 
 config MACH_OMAP_4430SDP