Merge branch 'master' into upstream

[linux-2.6] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index a601a17..f7b171b 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -27,7 +27,11 @@ config GENERIC_CALIBRATE_DELAY
 
 config GENERIC_HARDIRQS
        bool
-       default n
+       default y
+
+config GENERIC_HARDIRQS_NO__DO_IRQ
+       bool
+       default y
 
 config GENERIC_TIME
        bool
@@ -251,6 +255,12 @@ config MB93091_NO_MB
 endchoice
 endif
 
+config FUJITSU_MB93493
+       bool "MB93493 Multimedia chip"
+       help
+         Select this option if the MB93493 multimedia chip is going to be
+         used.
+
 choice
        prompt "GP-Relative data support"
        default GPREL_DATA_8