vserver 2.0 rc7

[linux-2.6.git] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index d648a48..e2ece5d 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -6,8 +6,7 @@
 mainmenu "Linux/PA-RISC Kernel Configuration"
 
 config PARISC
-       bool
-       default y
+       def_bool y
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,
@@ -15,19 +14,16 @@ config PARISC
          at <http://www.parisc-linux.org/>.
 
 config MMU
-       bool
-       default y
+       def_bool y
 
 config STACK_GROWSUP
-       bool
-       default y
+       def_bool y
 
 config UID16
        bool
 
 config RWSEM_GENERIC_SPINLOCK
-       bool
-       default y
+       def_bool y
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
@@ -49,6 +45,10 @@ config GENERIC_IRQ_PROBE
 config PM
        bool
 
+config ISA_DMA_API
+       bool
+       default y
+
 source "init/Kconfig"
 
 
@@ -111,7 +111,7 @@ config PREFETCH
        def_bool y
        depends on PA8X00
 
-config PARISC64
+config 64BIT
        bool "64-bit kernel"
        depends on PA8X00
        help
@@ -124,9 +124,6 @@ config PARISC64
          enable this option otherwise. The 64bit kernel is significantly bigger
          and slower than the 32bit one.
 
-config 64BIT
-       def_bool PARISC64
-
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -166,13 +163,12 @@ config PREEMPT
        default n
 
 config COMPAT
-       bool
-       depends on PARISC64
-       default y
+       def_bool y
+       depends on 64BIT
 
 config HPUX
        bool "Support for HP-UX binaries"
-       depends on !PARISC64
+       depends on !64BIT
 
 config NR_CPUS
        int "Maximum number of CPUs (2-32)"