Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2...

[linux-2.6-omap-h63xx.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 2b36afd8e969e479d88458bd5d092a4aa898c4cb..84caf50725b53e829df2a39baa059084d63663e4 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -25,6 +25,14 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 config GENERIC_FIND_NEXT_BIT
        bool
        default y
@@ -534,7 +542,7 @@ config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous Memory Support (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
-         Say Y to upport efficient handling of discontiguous physical memory,
+         Say Y to support efficient handling of discontiguous physical memory,
          for architectures which are either NUMA (Non-Uniform Memory Access)
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.