diff options
author | Paul Mackerras <paulus@samba.org> | 2008-02-06 12:08:37 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-06 12:08:37 +0100 |
commit | b370b08274a25cf1e2015fb7ce65c43173c8156f (patch) | |
tree | 0c8f990148da4ca1275ac5471c93c519754f4aec /arch/powerpc/platforms/Kconfig | |
parent | [POWERPC] arch/powerpc/platforms/82xx: Add missing of_node_put (diff) | |
parent | [POWERPC] 85xx: Add second cpu to 8572 dts (diff) | |
download | linux-b370b08274a25cf1e2015fb7ce65c43173c8156f.tar.xz linux-b370b08274a25cf1e2015fb7ce65c43173c8156f.zip |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index fdce10c4f074..045b8c80eeaf 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -24,6 +24,7 @@ config PPC_83xx select MPC83xx select IPIC select WANT_DEVICE_TREE + select FSL_EMB_PERFMON config PPC_86xx bool "Freescale 86xx" |