Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 1c2d87435233ca911ff1d4773cf7268a0847e504..e77a06e9621ec54278ed6c440866e5e9205031c4 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -19,9 +19,6 @@ config MMU
 config STACK_GROWSUP
        def_bool y
 
-config UID16
-       bool
-
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 
@@ -47,6 +44,10 @@ config PM
 
 config ISA_DMA_API
        bool
+
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       depends on BROKEN
        default y
 
 source "init/Kconfig"
@@ -150,13 +151,14 @@ config HOTPLUG_CPU
 
 config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous memory support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       depends on 64BIT && EXPERIMENTAL
        help
          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.
 
+source "kernel/Kconfig.hz"
 source "mm/Kconfig"
 
 config PREEMPT