Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

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

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 3168003..5f0cf0e 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -17,6 +17,7 @@ config MICROBLAZE
        select OF_EARLY_FLATTREE
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_PROBE
+       select GENERIC_HARDIRQS_NO_DEPRECATED
 
 config SWAP
        def_bool n
@@ -36,6 +37,9 @@ config ARCH_HAS_ILOG2_U64
 config GENERIC_FIND_NEXT_BIT
        def_bool y
 
+config GENERIC_FIND_BIT_LE
+       def_bool y
+
 config GENERIC_HWEIGHT
        def_bool y
 
@@ -183,6 +187,17 @@ config LOWMEM_SIZE
        hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
        default "0x30000000"
 
+config MANUAL_RESET_VECTOR
+       hex "Microblaze reset vector address setup"
+       default "0x0"
+       help
+         Set this option to have the kernel override the CPU Reset vector.
+         If zero, no change will be made to the MicroBlaze reset vector at
+         address 0x0.
+         If non-zero, a jump instruction to this address, will be written
+         to the reset vector at address 0x0.
+         If you are unsure, set it to default value 0x0.
+
 config KERNEL_START_BOOL
        bool "Set custom kernel base address"
        depends on ADVANCED_OPTIONS
@@ -247,7 +262,7 @@ endmenu
 
 source "mm/Kconfig"
 
-menu "Exectuable file formats"
+menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"