Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

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

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 776941c..d658101 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -8,9 +8,6 @@ config MMU
        bool
        default y
 
-config UID16
-       bool
-
 config GENERIC_HARDIRQS
        bool
        default y
@@ -568,6 +565,7 @@ config CHESTNUT
 
 config SPRUCE
        bool "IBM-Spruce"
+       select PPC_INDIRECT_PCI
 
 config HDPU
        bool "Sky-HDPU"
@@ -588,27 +586,35 @@ 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"
@@ -616,6 +622,7 @@ config PAL4
 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:
@@ -736,6 +743,20 @@ config MPC834x
        bool
        default y if MPC834x_SYS
 
+config PPC_83xx
+       bool
+       default y if 83xx
+
+config CPM1
+       bool
+       depends on 8xx
+       default y
+       help
+         The CPM1 (Communications Processor Module) is a coprocessor on
+         embedded CPUs made by Motorola.  Selecting this option means that
+         you wish to build a kernel for a machine with a CPM1 coprocessor
+         on it (8xx, 827x, 8560).
+
 config CPM2
        bool
        depends on 8260 || MPC8560 || MPC8555
@@ -749,11 +770,14 @@ config CPM2
 config PPC_CHRP
        bool
        depends on PPC_MULTIPLATFORM
+       select PPC_I8259
+       select PPC_INDIRECT_PCI
        default y
 
 config PPC_PMAC
        bool
        depends on PPC_MULTIPLATFORM
+       select PPC_INDIRECT_PCI
        default y
 
 config PPC_PMAC64
@@ -764,6 +788,8 @@ config PPC_PMAC64
 config PPC_PREP
        bool
        depends on PPC_MULTIPLATFORM
+       select PPC_I8259
+       select PPC_INDIRECT_PCI
        default y
 
 config PPC_OF
@@ -797,6 +823,7 @@ config MV64360              # Really MV64360 & MV64460
 config MV64X60
        bool
        depends on (GT64260 || MV64360)
+       select PPC_INDIRECT_PCI
        default y
 
 menu "Set bridge options"
@@ -845,6 +872,7 @@ config EPIC_SERIAL_MODE
 config MPC10X_BRIDGE
        bool
        depends on POWERPMC250 || LOPEC || SANDPOINT
+       select PPC_INDIRECT_PCI
        default y
 
 config MPC10X_OPENPIC
@@ -870,6 +898,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"
@@ -1127,6 +1156,7 @@ menu "Bus options"
 config ISA
        bool "Support for ISA-bus hardware"
        depends on PPC_PREP || PPC_CHRP
+       select PPC_I8259
        help
          Find out whether you have ISA slots on your motherboard.  ISA is the
          name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -1139,6 +1169,17 @@ config GENERIC_ISA_DMA
        depends on POWER3 || POWER4 || 6xx && !CPM2
        default y
 
+config PPC_I8259
+       bool
+       default y if 85xx
+       default n
+
+config PPC_INDIRECT_PCI
+       bool
+       depends on PCI
+       default y if 40x || 44x || 85xx || 83xx
+       default n
+
 config EISA
        bool
        help
@@ -1175,6 +1216,7 @@ config MPC83xx_PCI2
 config PCI_QSPAN
        bool "QSpan PCI"
        depends on !4xx && !CPM2 && 8xx
+       select PPC_I8259
        help
          Say Y here if you have a system based on a Motorola 8xx-series
          embedded processor with a QSPAN PCI interface, otherwise say N.
@@ -1182,6 +1224,7 @@ config PCI_QSPAN
 config PCI_8260
        bool
        depends on PCI && 8260
+       select PPC_INDIRECT_PCI
        default y
 
 config 8260_PCI9
@@ -1215,6 +1258,14 @@ source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 
+config RAPIDIO
+       bool "RapidIO support" if MPC8540 || MPC8560
+       help
+         If you say Y here, the kernel will include drivers and
+         infrastructure code to support RapidIO interconnect devices.
+
+source "drivers/rapidio/Kconfig"
+
 endmenu
 
 menu "Advanced setup"
@@ -1368,7 +1419,7 @@ endmenu
 
 source "lib/Kconfig"
 
-source "arch/ppc/oprofile/Kconfig"
+source "arch/powerpc/oprofile/Kconfig"
 
 source "arch/ppc/Kconfig.debug"