Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 4c315be250158fcfc1d1b24804f55ce76f137eb3..7fc41104d53eb8aee659bc9b909ad2da2680e0dd 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -29,24 +29,27 @@ config PPC_85xx
        bool "Freescale 85xx"
        select E500
        select FSL_SOC
-       select 85xx
        select WANT_DEVICE_TREE
+       select MPC85xx
 
 config PPC_8xx
        bool "Freescale 8xx"
        select FSL_SOC
        select 8xx
        select WANT_DEVICE_TREE
+       select PPC_LIB_RHEAP
 
 config 40x
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
        select WANT_DEVICE_TREE
+       select PPC_UDBG_16550
 
 config 44x
        bool "AMCC 44x"
        select PPC_DCR_NATIVE
        select WANT_DEVICE_TREE
+       select PPC_UDBG_16550
 
 config E200
        bool "Freescale e200"
@@ -90,14 +93,6 @@ config 6xx
 config 8xx
        bool
 
-# this is temp to handle compat with arch=ppc
-config 83xx
-       bool
-
-# this is temp to handle compat with arch=ppc
-config 85xx
-       bool
-
 config E500
        bool