X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Fcris%2FKconfig;h=222da1501f47c0e81508996e8f74ec7c5ff21353;hb=f290fc3669d659a915e29b6bdb82d454b437cf93;hp=b832619497372a6336b8ad46f1b21f01728d98bf;hpb=05814450070f13b671fc9dbf89477677aa0258cb;p=linux-2.6-omap-h63xx.git

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index b8326194973..222da1501f4 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -9,6 +9,14 @@ config MMU
 	bool
 	default y
 
+config ZONE_DMA
+	bool
+	default y
+
+config NO_DMA
+	bool
+	default y
+
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
@@ -16,10 +24,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
@@ -30,6 +61,10 @@ menu "General setup"
 
 source "fs/Kconfig.binfmt"
 
+config GENERIC_HARDIRQS
+	bool
+	default y
+
 config ETRAX_CMDLINE
 	string "Kernel command line"
 	default "root=/dev/mtdblock3"
@@ -122,7 +157,8 @@ source "net/Kconfig"
 
 # bring in ETRAX built-in drivers
 menu "Drivers for built-in interfaces"
-source arch/cris/arch-v10/drivers/Kconfig
+# arch/cris/arch is a symlink to correct arch (arch-v10 or arch-v32)
+source arch/cris/arch/drivers/Kconfig
 
 endmenu
 
@@ -153,7 +189,9 @@ source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
 
-source "drivers/cdrom/Kconfig"
+source "drivers/i2c/Kconfig"
+
+source "drivers/rtc/Kconfig"
 
 #
 # input before char - char/joystick depends on it. As does USB.
@@ -169,8 +207,14 @@ source "fs/Kconfig"
 
 source "sound/Kconfig"
 
+source "drivers/pcmcia/Kconfig"
+
+source "drivers/pci/Kconfig"
+
 source "drivers/usb/Kconfig"
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/cris/Kconfig.debug"
 
 source "security/Kconfig"