path: root/arch/cris/Kconfig
diff options
authorJesper Nilsson <jesper.nilsson@axis.com>2007-11-14 17:00:59 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-14 18:45:45 -0800
commit7b275523aba522aa76891861ee32ba2456e5f146 (patch)
tree6b5fa5c7916af2d91b81ca1eec3352a63eabe3ab /arch/cris/Kconfig
parentcris-build-fixes-update-eth_v10c-ethernet-driver-fix (diff)
cris build fixes: corrected and improved NMI and IRQ handling
Corrects compile errors and the following: - Remove oldset parameter from do_signal and do_notify_resume. - Modified to fit new consolidated IRQ handling code. - Reverse check order between external nmi and watchdog nmi to avoid false watchdog oops in case of a glitch on the nmi pin. - Return from an pin-generated NMI the same way as for other interrupts. - Moved blocking of ethernet rx/tx irq from ethernet interrupt handler to low-level asm interrupt handlers. Fixed in the multiple interrupt handler also. - Add space for thread local storage in thread_info struct. - Add NO_DMA to Kconfig, and include arch specific Kconfig using arch independent path. Include subsystem Kconfigs for pcmcia, usb, i2c, rtc and pci. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/Kconfig')
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index f653772a87a8..222da1501f47 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -13,6 +13,10 @@ config ZONE_DMA
default y
+config NO_DMA
+ bool
+ default y
default y
@@ -153,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
@@ -184,6 +189,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.
@@ -198,6 +207,10 @@ source "fs/Kconfig"
source "sound/Kconfig"
+source "drivers/pcmcia/Kconfig"
+source "drivers/pci/Kconfig"
source "drivers/usb/Kconfig"
source "kernel/Kconfig.instrumentation"