Pull release into acpica branch

[powerpc.git] / arch / powerpc / platforms / embedded6xx / Kconfig

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 2d755b7..4fdbc9a 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -27,6 +27,7 @@ config CHESTNUT
 
 config SPRUCE
        bool "IBM-Spruce"
+       select PPC_INDIRECT_PCI
 
 config HDPU
        bool "Sky-HDPU"
@@ -47,33 +48,42 @@ config EV64260
 
 config LOPEC
        bool "Motorola-LoPEC"
+       select PPC_I8259
 
 config MVME5100
        bool "Motorola-MVME5100"
+       select PPC_INDIRECT_PCI
 
 config PPLUS
        bool "Motorola-PowerPlus"
+       select PPC_I8259
+       select PPC_INDIRECT_PCI
 
 config PRPMC750
        bool "Motorola-PrPMC750"
+       select PPC_INDIRECT_PCI
 
 config PRPMC800
        bool "Motorola-PrPMC800"
+       select PPC_INDIRECT_PCI
 
 config SANDPOINT
        bool "Motorola-Sandpoint"
+       select PPC_I8259
        help
          Select SANDPOINT if configuring for a Motorola Sandpoint X3
          (any flavor).
 
 config RADSTONE_PPC7D
        bool "Radstone Technology PPC7D board"
+       select PPC_I8259
 
 config PAL4
        bool "SBS-Palomar4"
 
 config GEMINI
        bool "Synergy-Gemini"
+       select PPC_INDIRECT_PCI
        depends on BROKEN
        help
          Select Gemini if configuring for a Synergy Microsystems' Gemini
@@ -134,16 +144,6 @@ config LITE5200
          much but it's only been tested on this board version. I think this
          board is also known as IceCube.
 
-config MPC834x_SYS
-       bool "Freescale MPC834x SYS"
-       help
-         This option enables support for the MPC 834x SYS evaluation board.
-
-         Be aware that PCI buses can only function when SYS board is plugged
-         into the PIB (Platform IO Board) board from Freescale which provide
-         3 PCI slots.  The PIBs PCI initialization is the bootloader's
-         responsiblilty.
-
 config EV64360
        bool "Marvell-EV64360BP"
        help
@@ -182,14 +182,6 @@ config 8272
          The MPC8272 CPM has a different internal dpram setup than other CPM2
          devices
 
-config 83xx
-       bool
-       default y if MPC834x_SYS
-
-config MPC834x
-       bool
-       default y if MPC834x_SYS
-
 config CPM2
        bool
        depends on 8260 || MPC8560 || MPC8555
@@ -226,6 +218,7 @@ config MV64360              # Really MV64360 & MV64460
 config MV64X60
        bool
        depends on (GT64260 || MV64360)
+       select PPC_INDIRECT_PCI
        default y
 
 menu "Set bridge options"
@@ -274,6 +267,7 @@ config EPIC_SERIAL_MODE
 config MPC10X_BRIDGE
        bool
        depends on POWERPMC250 || LOPEC || SANDPOINT
+       select PPC_INDIRECT_PCI
        default y
 
 config MPC10X_OPENPIC
@@ -299,6 +293,7 @@ config HARRIER_STORE_GATHERING
 config MVME5100_IPMC761_PRESENT
        bool "MVME5100 configured with an IPMC761"
        depends on MVME5100
+       select PPC_I8259
 
 config SPRUCE_BAUD_33M
        bool "Spruce baud clock support"