This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 67c2bc9..6a4adf9 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -80,16 +80,6 @@ config PPC_PMAC
        select ADB_PMU
        select U3_DART
 
-config PPC_MAPLE
-       depends on PPC_MULTIPLATFORM
-       bool "  Maple 970FX Evaluation Board"
-       select U3_DART
-       select MPIC_BROKEN_U3
-       default n
-       help
-          This option enables support for the Maple 970FX Evaluation Board.
-         For more informations, refer to http://www.970eval.com
-
 config PPC
        bool
        default y
@@ -120,21 +110,11 @@ config PPC_SPLPAR
          processors, that is, which share physical processors between
          two or more partitions.
 
-config IBMVIO
-       depends on PPC_PSERIES || PPC_ISERIES
-       bool
-       default y
-
 config U3_DART
        bool 
        depends on PPC_MULTIPLATFORM
        default n
 
-config MPIC_BROKEN_U3
-       bool
-       depends on PPC_MAPLE
-       default y
-
 config PPC_PMAC64
        bool
        depends on PPC_PMAC
@@ -227,13 +207,6 @@ config PREEMPT
          Say Y here if you are building a kernel for a desktop, embedded
          or real-time system.  Say N if you are unsure.
 
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-       bool
-       default y
-
 config MSCHUNKS
        bool
        depends on PPC_ISERIES
@@ -378,11 +351,6 @@ source "kernel/vserver/Kconfig"
 
 source "security/Kconfig"
 
-config KEYS_COMPAT
-       bool
-       depends on COMPAT && KEYS
-       default y
-
 source "crypto/Kconfig"
 
 source "lib/Kconfig"