Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge

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

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index cc6013ffc29ae7957281d28406cd426f6dc13e51..229d355ed86a7264548e1dcb0b4145a3e0349c6a 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -117,7 +117,7 @@ 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).
@@ -264,6 +264,7 @@ config TAU_AVERAGE
 
 config QUICC_ENGINE
        bool
+       select PPC_LIB_RHEAP
        help
          The QUICC Engine (QE) is a new generation of communications
          coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
@@ -274,6 +275,7 @@ config CPM2
        bool
        default n
        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 +315,6 @@ config FSL_ULI1575
 config CPM
        bool
 
+source "arch/powerpc/sysdev/bestcomm/Kconfig"
+
 endmenu