Commit 6299afc4 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[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: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f08243a4
...@@ -1122,7 +1122,9 @@ config PROC_HARDWARE ...@@ -1122,7 +1122,9 @@ config PROC_HARDWARE
source "drivers/zorro/Kconfig" source "drivers/zorro/Kconfig"
if !44x || BROKEN
source kernel/power/Kconfig source kernel/power/Kconfig
endif
config SECCOMP config SECCOMP
bool "Enable seccomp to safely compute untrusted bytecode" bool "Enable seccomp to safely compute untrusted bytecode"
......
...@@ -240,10 +240,6 @@ config PPC_GEN550 ...@@ -240,10 +240,6 @@ config PPC_GEN550
depends on 4xx depends on 4xx
default y default y
config PM
bool "Power Management support (EXPERIMENTAL)"
depends on 4xx && EXPERIMENTAL
choice choice
prompt "TTYS0 device and default console" prompt "TTYS0 device and default console"
depends on 40x depends on 40x
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment