projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f08243a)
[PATCH] Kconfig fix (CONFIG_PM on 44x)
authorAl Viro <viro@www.linux.org.uk>
Tue, 23 Aug 2005 21:46:41 +0000 (22:46 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 Aug 2005 01:43:43 +0000 (18:43 -0700)
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>
arch/ppc/Kconfig patch | blob | blame | history
arch/ppc/platforms/4xx/Kconfig patch | blob | blame | history

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 015333033127860ce2e7220dd509331dec768bcf..e6fa1d1cc03a210991b6b029cd9c6bb50106037e 100644 (file)
--- 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 853ee908c6ebb6235fad9cd0236d495c145138db..805dd98908a3cd4e90164f2e0c1cde80d0c8ef5e 100644 (file)
--- 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