X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Fcris%2FKconfig;h=27b082ac7f11e25e8d6b292b54af2c932f259217;hb=2d33d563b1e2b4748c585e3169f46481e897c829;hp=21900a9378bbc04b4bb5fccd6161fb86a4d86ecd;hpb=37e58df30063e229ee5157f9d1c1fa1d749917c2;p=linux-2.6-omap-h63xx.git

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 21900a9378b..27b082ac7f1 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -13,6 +13,10 @@ config ZONE_DMA
 	bool
 	default y
 
+config NO_DMA
+	bool
+	default y
+
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
@@ -57,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"
@@ -142,6 +150,7 @@ config ETRAX_FLASH_BUSWIDTH
 	  Width in bytes of the Flash bus (1, 2 or 4). Is usually 2.
 
 source arch/cris/arch-v10/Kconfig
+source arch/cris/arch-v32/Kconfig
 
 endmenu
 
@@ -150,6 +159,7 @@ source "net/Kconfig"
 # bring in ETRAX built-in drivers
 menu "Drivers for built-in interfaces"
 source arch/cris/arch-v10/drivers/Kconfig
+source arch/cris/arch-v32/drivers/Kconfig
 
 endmenu
 
@@ -180,6 +190,10 @@ source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
 
+source "drivers/i2c/Kconfig"
+
+source "drivers/rtc/Kconfig"
+
 #
 # input before char - char/joystick depends on it. As does USB.
 #
@@ -194,9 +208,11 @@ source "fs/Kconfig"
 
 source "sound/Kconfig"
 
-source "drivers/usb/Kconfig"
+source "drivers/pcmcia/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
+source "drivers/pci/Kconfig"
+
+source "drivers/usb/Kconfig"
 
 source "arch/cris/Kconfig.debug"