From 3ebd218dcc4774b230be5d25aeccbd144d117dce Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 23 Aug 2005 22:46:41 +0100 Subject: [PATCH] --- yaml --- r: 5958 b: refs/heads/master c: 6299afc40c8612a87358ecea80882395fe67111f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ppc/Kconfig | 2 ++ trunk/arch/ppc/platforms/4xx/Kconfig | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8878efdac972..a478c8639de1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f08243a491f3e21feabbb04476a03fb0cbc975ff +refs/heads/master: 6299afc40c8612a87358ecea80882395fe67111f diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig index 015333033127..e6fa1d1cc03a 100644 --- a/trunk/arch/ppc/Kconfig +++ b/trunk/arch/ppc/Kconfig @@ -1122,7 +1122,9 @@ config PROC_HARDWARE source "drivers/zorro/Kconfig" +if !44x || BROKEN source kernel/power/Kconfig +endif config SECCOMP bool "Enable seccomp to safely compute untrusted bytecode" diff --git a/trunk/arch/ppc/platforms/4xx/Kconfig b/trunk/arch/ppc/platforms/4xx/Kconfig index 853ee908c6eb..805dd98908a3 100644 --- a/trunk/arch/ppc/platforms/4xx/Kconfig +++ b/trunk/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 - choice prompt "TTYS0 device and default console" depends on 40x