summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/Kconfig
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-17 14:31:13 +0200
committerPaul Mackerras <paulus@samba.org>2007-10-17 14:31:13 +0200
commit4acadb965c4aa587aac29a0a91203c4745d6fb4e (patch)
treed2284b40a6b8948947890e1ca33ae23545b6e5a7 /arch/powerpc/platforms/Kconfig
parentMerge branch 'fixes-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/ga... (diff)
parent[POWERPC] mpc52xx: device tree changes for FEC and MDIO (diff)
downloadlinux-4acadb965c4aa587aac29a0a91203c4745d6fb4e.tar.xz
linux-4acadb965c4aa587aac29a0a91203c4745d6fb4e.zip
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r--arch/powerpc/platforms/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 186397f283bb..229d355ed86a 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -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