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

diff --combined arch/powerpc/Kconfig
index 5e001ad588a7d385ea5f916ccd32b72c92ed93fe,8300e6a3d52c3eee1d54589bb9d80568e9e2c104..5624fb060d9d865b7661a8e7d58f9663587f422b
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -295,7 -295,6 +295,7 @@@ config ARCH_FLATMEM_ENABL
  config ARCH_SPARSEMEM_ENABLE
        def_bool y
        depends on PPC64
 +      select SPARSEMEM_VMEMMAP_ENABLE
  
  config ARCH_SPARSEMEM_DEFAULT
        def_bool y
@@@ -699,3 -698,7 +699,7 @@@ source "crypto/Kconfig
  config PPC_CLOCK
        bool
        default n
+ 
+ config PPC_LIB_RHEAP
+       bool
+ 

diff --combined arch/powerpc/platforms/Kconfig
index 186397f283bbbcbc187f75e235b172f584d3619e,bdced1e42293c6b6aac407967faf5d579fe6e085..229d355ed86a7264548e1dcb0b4145a3e0349c6a
--- 1/arch/powerpc/platforms/Kconfig
--- 2/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@@ -117,7 -117,7 +117,7 @@@ config RTAS_FLAS
  
  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 +264,7 @@@ config TAU_AVERAG
  
  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 +275,7 @@@ config CPM
        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 +315,6 @@@ config FSL_ULI157
  config CPM
        bool
  
+ source "arch/powerpc/sysdev/bestcomm/Kconfig"
+ 
  endmenu