Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 5f2cef0..361acfa 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,5 +1,4 @@
 menu "Platform support"
-       depends on PPC64 || CLASSIC32 || PPC_86xx
 
 choice
        prompt "Machine type"
@@ -26,14 +25,6 @@ config APUS
          <http://linux-apus.sourceforge.net/>.
 endchoice
 
-config QUICC_ENGINE
-       bool
-       help
-         The QUICC Engine (QE) is a new generation of communications
-         coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
-         Selecting this option means that you wish to build a kernel
-         for a machine with a QE coprocessor.
-
 source "arch/powerpc/platforms/pseries/Kconfig"
 source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"
@@ -42,10 +33,17 @@ source "arch/powerpc/platforms/powermac/Kconfig"
 source "arch/powerpc/platforms/prep/Kconfig"
 source "arch/powerpc/platforms/maple/Kconfig"
 source "arch/powerpc/platforms/pasemi/Kconfig"
-source arch/powerpc/platforms/celleb/Kconfig
-source arch/powerpc/platforms/ps3/Kconfig
-source arch/powerpc/platforms/cell/Kconfig
+source "arch/powerpc/platforms/celleb/Kconfig"
+source "arch/powerpc/platforms/ps3/Kconfig"
+source "arch/powerpc/platforms/cell/Kconfig"
+source "arch/powerpc/platforms/8xx/Kconfig"
+source "arch/powerpc/platforms/82xx/Kconfig"
+source "arch/powerpc/platforms/83xx/Kconfig"
+source "arch/powerpc/platforms/85xx/Kconfig"
 source "arch/powerpc/platforms/86xx/Kconfig"
+source "arch/powerpc/platforms/embedded6xx/Kconfig"
+source "arch/powerpc/platforms/44x/Kconfig"
+#source "arch/powerpc/platforms/4xx/Kconfig
 
 config PPC_NATIVE
        bool
@@ -70,6 +68,18 @@ config XICS
        bool
        default y
 
+config MPIC
+       bool
+       default n
+
+config MPIC_WEIRD
+       bool
+       default n
+
+config PPC_I8259
+       bool
+       default n
+
 config U3_DART
        bool
        depends on PPC_MULTIPLATFORM && PPC64
@@ -106,7 +116,7 @@ config MMIO_NVRAM
        bool
        default n
 
-config MPIC_BROKEN_U3
+config MPIC_U3_HT_IRQS
        bool
        depends on PPC_MAPLE
        default y
@@ -139,14 +149,14 @@ config GENERIC_IOMAP
        bool
        default n
 
-menu "CPU Frequency support"
-       depends on PPC64 || CLASSIC32
-
 source "drivers/cpufreq/Kconfig"
 
+menu "CPU Frequency drivers"
+       depends on CPU_FREQ
+
 config CPU_FREQ_PMAC
        bool "Support for Apple PowerBooks"
-       depends on CPU_FREQ && ADB_PMU && PPC32
+       depends on ADB_PMU && PPC32
        select CPU_FREQ_TABLE
        help
          This adds support for frequency switching on Apple PowerBooks,
@@ -155,11 +165,21 @@ config CPU_FREQ_PMAC
 
 config CPU_FREQ_PMAC64
        bool "Support for some Apple G5s"
-       depends on CPU_FREQ && PPC64
+       depends on PPC_PMAC && PPC64
        select CPU_FREQ_TABLE
        help
          This adds support for frequency switching on Apple iMac G5,
          and some of the more recent desktop G5 machines as well.
+
+config PPC_PASEMI_CPUFREQ
+       bool "Support for PA Semi PWRficient"
+       depends on PPC_PASEMI
+       default y
+       select CPU_FREQ_TABLE
+       help
+         This adds the support for frequency switching on PA Semi
+         PWRficient processors.
+
 endmenu
 
 config PPC601_SYNC_FIX
@@ -220,4 +240,21 @@ config TAU_AVERAGE
 
          If in doubt, say N here.
 
+config QUICC_ENGINE
+       bool
+       help
+         The QUICC Engine (QE) is a new generation of communications
+         coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
+         Selecting this option means that you wish to build a kernel
+         for a machine with a QE coprocessor.
+
+config CPM2
+       bool
+       default n
+       help
+         The CPM2 (Communications Processor Module) is a coprocessor on
+         embedded CPUs made by Freescale.  Selecting this option means that
+         you wish to build a kernel for a machine with a CPM2 coprocessor
+         on it (826x, 827x, 8560).
+
 endmenu