Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

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

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 0afd22595546fc68d981972e15e0815eda7da09d..87454c52697326e9173b4f695b46b9e705a77e97 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -22,7 +22,6 @@ config PPC_83xx
        select FSL_SOC
        select MPC83xx
        select IPIC
-       select FSL_EMB_PERFMON
 
 config PPC_86xx
        bool "Freescale 86xx"
@@ -46,7 +45,6 @@ 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/8xx/Kconfig"
@@ -291,13 +289,7 @@ config CPM2
 config PPC_CPM_NEW_BINDING
        bool
        depends on CPM1 || CPM2
-       help
-         Select this if your board has been converted to use the new
-         device tree bindings for CPM, and no longer needs the
-         ioport callbacks or the platform device glue code.
-
-         The fs_enet and cpm_uart drivers will be built as
-         of_platform devices.
+       default y
 
 config AXON_RAM
        tristate "Axon DDR2 memory device driver"