Merge remote-tracking branch 'kumar/next' into next

[~andy/linux] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ea5bb045983a19070958b003a8408841bce35a7c..84cb0c932153bc4720da26fff8cf7de305db733c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -428,11 +428,6 @@ config NODES_SHIFT
        default "4"
        depends on NEED_MULTIPLE_NODES
 
-config MAX_ACTIVE_REGIONS
-       int
-       default "256" if PPC64
-       default "32"
-
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
        depends on PPC64
@@ -647,14 +642,14 @@ menu "Bus options"
 
 config ISA
        bool "Support for ISA-bus hardware"
-       depends on PPC_PREP || PPC_CHRP
+       depends on 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
          inside your box.  If you have an Apple machine, say N here; if you
-         have an IBM RS/6000 or pSeries machine or a PReP machine, say Y.  If
-         you have an embedded board, consult your board documentation.
+         have an IBM RS/6000 or pSeries machine, say Y.  If you have an
+         embedded board, consult your board documentation.
 
 config ZONE_DMA
        bool
@@ -686,7 +681,6 @@ config SBUS
 config FSL_SOC
        bool
        select HAVE_CAN_FLEXCAN if NET && CAN
-       select PPC_CLOCK
 
 config FSL_PCI
        bool
@@ -745,7 +739,6 @@ config PCI
        bool "PCI support" if PPC_PCI_CHOICE
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
-       default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
        select ARCH_SUPPORTS_MSI
        select GENERIC_PCI_IOMAP
@@ -775,11 +768,6 @@ config PCI_8260
        select PPC_INDIRECT_PCI
        default y
 
-config 8260_PCI9
-       bool "Enable workaround for MPC826x erratum PCI 9"
-       depends on PCI_8260 && !8272
-       default y
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
@@ -969,7 +957,7 @@ config TASK_SIZE_BOOL
 
 config TASK_SIZE
        hex "Size of user task space" if TASK_SIZE_BOOL
-       default "0x80000000" if PPC_PREP || PPC_8xx
+       default "0x80000000" if PPC_8xx
        default "0xc0000000"
 
 config CONSISTENT_SIZE_BOOL