tree 8940b518f5bc72bd05722873829884e1ab8f9dc8
parent f08243a491f3e21feabbb04476a03fb0cbc975ff
author Al Viro <[EMAIL PROTECTED]> Tue, 23 Aug 2005 22:46:41 +0100
committer Linus Torvalds <[EMAIL PROTECTED]> Wed, 24 Aug 2005 08:43:43 -0700

[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 <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 arch/ppc/Kconfig               |    2 ++
 arch/ppc/platforms/4xx/Kconfig |    4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1122,7 +1122,9 @@ config PROC_HARDWARE
 source "drivers/zorro/Kconfig"
+if !44x || BROKEN
 source kernel/power/Kconfig
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -240,10 +240,6 @@ config PPC_GEN550
        depends on 4xx
        default y
-config PM
-       bool "Power Management support (EXPERIMENTAL)"
-       depends on 4xx && EXPERIMENTAL
        prompt "TTYS0 device and default console"
        depends on 40x
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to