Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index cc6013f..fdce10c 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -21,7 +21,8 @@ config PPC_83xx
        bool "Freescale 83xx"
        depends on 6xx
        select FSL_SOC
-       select 83xx
+       select MPC83xx
+       select IPIC
        select WANT_DEVICE_TREE
 
 config PPC_86xx
@@ -80,6 +81,10 @@ config XICS
        bool
        default y
 
+config IPIC
+       bool
+       default n
+
 config MPIC
        bool
        default n
@@ -117,10 +122,10 @@ config RTAS_FLASH
 
 config PPC_PMI
        tristate "Support for PMI"
-       depends PPC_IBM_CELL_BLADE
+       depends on PPC_IBM_CELL_BLADE
        help
          PMI (Platform Management Interrupt) is a way to
-         communicate with the BMC (Baseboard Mangement Controller).
+         communicate with the BMC (Baseboard Management Controller).
          It is used in some IBM Cell blades.
        default m
 
@@ -264,6 +269,8 @@ config TAU_AVERAGE
 
 config QUICC_ENGINE
        bool
+       select PPC_LIB_RHEAP
+       select CRC32
        help
          The QUICC Engine (QE) is a new generation of communications
          coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
@@ -271,9 +278,10 @@ config QUICC_ENGINE
          for a machine with a QE coprocessor.
 
 config CPM2
-       bool
-       default n
+       bool "Enable support for the CPM2 (Communications Processor Module)"
+       depends on MPC85xx || 8260
        select CPM
+       select PPC_LIB_RHEAP
        help
          The CPM2 (Communications Processor Module) is a coprocessor on
          embedded CPUs made by Freescale.  Selecting this option means that
@@ -313,4 +321,12 @@ config FSL_ULI1575
 config CPM
        bool
 
+config OF_RTC
+       bool
+       help
+         Uses information from the OF or flattened device tree to instatiate
+         platform devices for direct mapped RTC chips like the DS1742 or DS1743.
+
+source "arch/powerpc/sysdev/bestcomm/Kconfig"
+
 endmenu