diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-08-23 22:46:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 18:43:43 -0700 |
| commit | 6299afc40c8612a87358ecea80882395fe67111f (patch) | |
| tree | 8940b518f5bc72bd05722873829884e1ab8f9dc8 /arch/ppc | |
| parent | f08243a491f3e21feabbb04476a03fb0cbc975ff (diff) | |
| download | op-kernel-dev-6299afc40c8612a87358ecea80882395fe67111f.zip op-kernel-dev-6299afc40c8612a87358ecea80882395fe67111f.tar.gz | |
[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')
| -rw-r--r-- | arch/ppc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/Kconfig | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 0153330..e6fa1d1 100644 --- 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 +endif config SECCOMP bool "Enable seccomp to safely compute untrusted bytecode" diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig index 853ee90..805dd98 100644 --- 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 - choice prompt "TTYS0 device and default console" depends on 40x |
