aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc/Kconfig2
-rw-r--r--arch/ppc/platforms/4xx/Kconfig4
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 015333033127..e6fa1d1cc03a 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1122,7 +1122,9 @@ config PROC_HARDWARE
1122 1122
1123source "drivers/zorro/Kconfig" 1123source "drivers/zorro/Kconfig"
1124 1124
1125if !44x || BROKEN
1125source kernel/power/Kconfig 1126source kernel/power/Kconfig
1127endif
1126 1128
1127config SECCOMP 1129config SECCOMP
1128 bool "Enable seccomp to safely compute untrusted bytecode" 1130 bool "Enable seccomp to safely compute untrusted bytecode"
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index 853ee908c6eb..805dd98908a3 100644
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -240,10 +240,6 @@ config PPC_GEN550
240 depends on 4xx 240 depends on 4xx
241 default y 241 default y
242 242
243config PM
244 bool "Power Management support (EXPERIMENTAL)"
245 depends on 4xx && EXPERIMENTAL
246
247choice 243choice
248 prompt "TTYS0 device and default console" 244 prompt "TTYS0 device and default console"
249 depends on 40x 245 depends on 40x