karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / mx6 / Kconfig

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index dce7ffc022ae7ef9d30a29147c509dfdd3cd98f5..373ef3fd3bab62f2ea35e38abf38397747cbc1d5 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -1,31 +1,31 @@
 if ARCH_MX6
 
-config MX6
+config SOC_MX6
        bool
        default y
 
-config MX6D
+config SOC_MX6D
        bool
 
-config MX6DL
+config SOC_MX6DL
        bool
 
-config MX6Q
+config SOC_MX6Q
        bool
 
-config MX6QDL
+config SOC_MX6QDL
        bool
 
-config MX6S
+config SOC_MX6S
        bool
 
-config MX6SL
+config SOC_MX6SL
        bool
 
-config MX6SX
+config SOC_MX6SX
        bool
 
-config MX6UL
+config SOC_MX6UL
        select SYS_L2CACHE_OFF
        bool