Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index ef018e2..ccce2a4 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -19,6 +19,14 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default y
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -52,6 +60,11 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
 source "init/Kconfig"
 
 menu "Processor"
@@ -77,9 +90,11 @@ config 6xx
 
 config 40x
        bool "40x"
+       select PPC_DCR_NATIVE
 
 config 44x
        bool "44x"
+       select PPC_DCR_NATIVE
 
 config 8xx
        bool "8xx"
@@ -95,6 +110,15 @@ endchoice
 config PPC_FPU
        bool
 
+config PPC_DCR_NATIVE
+       bool
+       default n
+
+config PPC_DCR
+       bool
+       depends on PPC_DCR_NATIVE
+       default y
+
 config BOOKE
        bool
        depends on E200 || E500
@@ -600,7 +624,7 @@ config HDPU
          Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-       depends HDPU
+       depends on HDPU
        tristate "HDPU-Features"
        help
          Select to enable HDPU enhanced features.
@@ -646,15 +670,6 @@ config RADSTONE_PPC7D
 config PAL4
        bool "SBS-Palomar4"
 
-config GEMINI
-       bool "Synergy-Gemini"
-       depends on BROKEN
-       select PPC_INDIRECT_PCI
-       help
-         Select Gemini if configuring for a Synergy Microsystems' Gemini
-         series Single Board Computer.  More information is available at:
-         <http://www.synergymicro.com/PressRel/97_10_15.html>.
-
 config EST8260
        bool "EST8260"
        ---help---
@@ -711,7 +726,7 @@ config LITE5200
 
 config LITE5200B
        bool "Freescale LITE5200B"
-       depends LITE5200
+       depends on LITE5200
        help
          Support for the LITE5200B dev board for the MPC5200 from Freescale.
          This is the new board with 2 PCI slots.
@@ -830,6 +845,21 @@ config MV64X60
        select PPC_INDIRECT_PCI
        default y
 
+config MV643XX_ETH_0
+       bool
+       depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360 || HDPU)
+       default y
+
+config MV643XX_ETH_1
+       bool
+       depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360)
+       default y
+
+config MV643XX_ETH_2
+       bool
+       depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360)
+       default y
+
 menu "Set bridge options"
        depends on MV64X60
 
@@ -1162,6 +1192,10 @@ config ISA
          have an IBM RS/6000 or pSeries machine or a PReP machine, say Y.  If
          you have an embedded board, consult your board documentation.
 
+config ZONE_DMA
+       bool
+       default y
+
 config GENERIC_ISA_DMA
        bool
        depends on 6xx && !CPM2