X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Fcris%2FKconfig;h=6b4d026a00a120e5728d8930bb6d4ad43a6b4006;hb=4a2a4da43995864786d59f5f0ebf42c0c1e2cdd1;hp=6a1238a29d6c4d98d46156a1863e4a342478d7db;hpb=0950c358ee8e969fce45ba363ca1deaf211e57b0;p=firefly-linux-kernel-4.4.55.git

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 6a1238a29d6c..6b4d026a00a1 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -9,6 +9,10 @@ config MMU
 	bool
 	default y
 
+config ZONE_DMA
+	bool
+	default y
+
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
@@ -16,6 +20,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 
+config ARCH_HAS_ILOG2_U32
+	bool
+	default n
+
+config ARCH_HAS_ILOG2_U64
+	bool
+	default n
+
 config GENERIC_FIND_NEXT_BIT
 	bool
 	default y
@@ -32,6 +44,9 @@ config IRQ_PER_CPU
 	bool
 	default y
 
+config NO_IOPORT
+	def_bool y
+
 config CRIS
 	bool
 	default y
@@ -165,8 +180,6 @@ source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
 
-source "drivers/cdrom/Kconfig"
-
 #
 # input before char - char/joystick depends on it. As does USB.
 #