aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/Kconfig
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-08-23 17:46:41 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 21:43:43 -0400
commit6299afc40c8612a87358ecea80882395fe67111f (patch)
tree8940b518f5bc72bd05722873829884e1ab8f9dc8 /arch/ppc/Kconfig
parentf08243a491f3e21feabbb04476a03fb0cbc975ff (diff)
[PATCH] Kconfig fix (CONFIG_PM on 44x)
CONFIG_PM is broken on 44x; removed duplicate entry for CONFIG_PM, made the inclusion of generic one conditional on BROKEN || !44x. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/Kconfig')
-rw-r--r--arch/ppc/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 015333033127..e6fa1d1cc03a 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1122,7 +1122,9 @@ config PROC_HARDWARE
1122 1122
1123source "drivers/zorro/Kconfig" 1123source "drivers/zorro/Kconfig"
1124 1124
1125if !44x || BROKEN
1125source kernel/power/Kconfig 1126source kernel/power/Kconfig
1127endif
1126 1128
1127config SECCOMP 1129config SECCOMP
1128 bool "Enable seccomp to safely compute untrusted bytecode" 1130 bool "Enable seccomp to safely compute untrusted bytecode"