Skip to content

Commit

Permalink
[PATCH] Kconfig fix (CONFIG_PM on 44x)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Aug 24, 2005
1 parent f08243a commit 6299afc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 2 additions & 0 deletions arch/ppc/Kconfig
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions arch/ppc/platforms/4xx/Kconfig
Expand Up @@ -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
Expand Down

0 comments on commit 6299afc

Please sign in to comment.