public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
* [PATCH] (23/43) Kconfig fix (CONFIG_PM on 44x)
@ 2005-08-23 21:46 Al Viro
  0 siblings, 0 replies; only message in thread
From: Al Viro @ 2005-08-23 21:46 UTC (permalink / raw)
  To: torvalds; +Cc: linuxppc-dev, linux-kernel

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>
----
diff -urN RC13-rc6-git13-4xx-early-serial/arch/ppc/Kconfig RC13-rc6-git13-44x-PM/arch/ppc/Kconfig
--- RC13-rc6-git13-4xx-early-serial/arch/ppc/Kconfig	2005-08-21 13:17:04.000000000 -0400
+++ RC13-rc6-git13-44x-PM/arch/ppc/Kconfig	2005-08-21 13:17:06.000000000 -0400
@@ -1126,7 +1126,9 @@
 
 source "drivers/zorro/Kconfig"
 
+if !44x || BROKEN
 source kernel/power/Kconfig
+endif
 
 config SECCOMP
 	bool "Enable seccomp to safely compute untrusted bytecode"
diff -urN RC13-rc6-git13-4xx-early-serial/arch/ppc/platforms/4xx/Kconfig RC13-rc6-git13-44x-PM/arch/ppc/platforms/4xx/Kconfig
--- RC13-rc6-git13-4xx-early-serial/arch/ppc/platforms/4xx/Kconfig	2005-08-21 13:17:05.000000000 -0400
+++ RC13-rc6-git13-44x-PM/arch/ppc/platforms/4xx/Kconfig	2005-08-21 13:17:06.000000000 -0400
@@ -240,10 +240,6 @@
 	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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-08-23 21:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-23 21:46 [PATCH] (23/43) Kconfig fix (CONFIG_PM on 44x) Al Viro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox