Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6299afc4 authored Aug 23, 2005 by Al Viro Committed by Linus Torvalds Aug 23, 2005

[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>

parent f08243a4

arch/ppc/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -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"

arch/ppc/platforms/4xx/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -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