diff --git a/[refs] b/[refs] index b9efcca6df3b..3ac4aa7f06b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2578bfae84a78bd46fdbc0d2f9d39e9fbc9c8a3f +refs/heads/master: 94987aff23bcdd7cee92edf02c2f4ef259d1cbf6 diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig index c2087f645ad3..20dce4681259 100644 --- a/trunk/arch/ppc/Kconfig +++ b/trunk/arch/ppc/Kconfig @@ -1016,7 +1016,7 @@ config CMDLINE some command-line options at build time by entering them here. In most cases you will need to specify the root device here. -if !44x || BROKEN +if BROKEN source kernel/power/Kconfig endif