Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[pandora-kernel.git] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index e083837..7561d7b 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -17,18 +17,38 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default n
 
 config GENERIC_HARDIRQS
        bool
-       default n
+       default y
+
+config GENERIC_HARDIRQS_NO__DO_IRQ
+       bool
+       default y
+
+config GENERIC_TIME
+       bool
+       default y
 
 config TIME_LOW_RES
        bool
        default y
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default y
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default y
+
 mainmenu "Fujitsu FR-V Kernel Configuration"
 
 source "init/Kconfig"
@@ -74,6 +94,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
@@ -243,6 +271,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