cris: drivers/cdrom/Kconfig no longer exists

[firefly-linux-kernel-4.4.55.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e5979d68e3524d595f6a108fd122d30020f9b660..6b4d026a00a120e5728d8930bb6d4ad43a6b4006 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -9,7 +9,7 @@ config MMU
        bool
        default y
 
-config UID16
+config ZONE_DMA
        bool
        default y
 
@@ -20,10 +20,33 @@ 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
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config IRQ_PER_CPU
+       bool
+       default y
+
+config NO_IOPORT
+       def_bool y
+
 config CRIS
        bool
        default y
@@ -157,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.
 #