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 <[EMAIL PROTECTED]> ---- 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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/