s390/sclp: _sclp_wait_int(): retain full PSW mask

[karo-tx-linux.git] / arch / mips / jz4740 / Kconfig

diff --git a/arch/mips/jz4740/Kconfig b/arch/mips/jz4740/Kconfig
index 4689030538839b796cd76567b495bef494a8c0e7..36f82017695dbd1b50f9d862487f991676375bd3 100644 (file)
--- a/arch/mips/jz4740/Kconfig
+++ b/arch/mips/jz4740/Kconfig
@@ -1,9 +1,24 @@
 choice
        prompt "Machine type"
-       depends on MACH_JZ4740
+       depends on MACH_INGENIC
        default JZ4740_QI_LB60
 
 config JZ4740_QI_LB60
        bool "Qi Hardware Ben NanoNote"
+       select MACH_JZ4740
+
+config JZ4780_CI20
+       bool "MIPS Creator CI20"
+       select MACH_JZ4780
 
 endchoice
+
+config MACH_JZ4740
+       bool
+       select SYS_HAS_CPU_MIPS32_R1
+
+config MACH_JZ4780
+       bool
+       select MIPS_CPU_SCACHE
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_SUPPORTS_HIGHMEM