summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-17 22:31:13 +1000
committerPaul Mackerras <paulus@samba.org>2007-10-17 22:31:13 +1000
commit4acadb965c4aa587aac29a0a91203c4745d6fb4e (patch)
treed2284b40a6b8948947890e1ca33ae23545b6e5a7 /arch/ppc
parent5cae826e9e54a31f06b4c11b73f4af29e2ea4932 (diff)
parentb147d93d62d161559a49e0108767122caa4d2576 (diff)
downloadkernel-crypto-4acadb965c4aa587aac29a0a91203c4745d6fb4e.tar.gz
kernel-crypto-4acadb965c4aa587aac29a0a91203c4745d6fb4e.tar.xz
kernel-crypto-4acadb965c4aa587aac29a0a91203c4745d6fb4e.zip
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 20dce468125..607925c8a99 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -102,6 +102,7 @@ config 44x
config 8xx
bool "8xx"
+ select PPC_LIB_RHEAP
config E200
bool "e200"
@@ -798,6 +799,7 @@ config CPM1
config CPM2
bool
depends on 8260 || MPC8560 || MPC8555
+ select PPC_LIB_RHEAP
default y
help
The CPM2 (Communications Processor Module) is a coprocessor on
@@ -1277,6 +1279,10 @@ config BOOT_LOAD
config PIN_TLB
bool "Pinned Kernel TLBs (860 ONLY)"
depends on ADVANCED_OPTIONS && 8xx
+
+config PPC_LIB_RHEAP
+ bool
+
endmenu
source "net/Kconfig"