Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

[linux-2.6] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index a601a17cf568b8f409fc39e2023bef84d557d012..cf1c446e003ac6cad36c4a354872d0b41b2a2925 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
@@ -82,6 +86,14 @@ config HIGHPTE
          with a lot of RAM, this can be wasteful of precious low memory.
          Setting this option will put user-space page tables in high memory.
 
+config LARGE_ALLOCS
+       bool "Allow allocating large blocks (> 1MB) of memory"
+       help
+         Allow the slab memory allocator to keep chains for very large memory
+         sizes - up to 32MB. You may need this if your system has a lot of
+         RAM, and you need to able to allocate very large contiguous chunks.
+         If unsure, say N.
+
 source "mm/Kconfig"
 
 choice
@@ -251,6 +263,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