aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/Kconfig.cpu
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-01-16 21:53:26 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-21 17:43:13 -0500
commit0d57af1ec7e278a49dd881d326484773e3866150 (patch)
tree71afc0760c23c8d7e5de0847d700bcfd550fc4cc /arch/sh/Kconfig.cpu
parent642e56ff5318e9ef742c0ac5c2e16b96902c50a0 (diff)
arch/sh: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it from any "depends on" lines in Kconfigs. CC: Paul Mundt <lethal@linux-sh.org> CC: Tejun Heo <tj@kernel.org> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sh/Kconfig.cpu')
-rw-r--r--arch/sh/Kconfig.cpu3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu
index 770ff2d5b94d..05b518e90cf7 100644
--- a/arch/sh/Kconfig.cpu
+++ b/arch/sh/Kconfig.cpu
@@ -33,7 +33,7 @@ config SH64_FPU_DENORM_FLUSH
33config SH_FPU_EMU 33config SH_FPU_EMU
34 def_bool n 34 def_bool n
35 prompt "FPU emulation support" 35 prompt "FPU emulation support"
36 depends on !SH_FPU && EXPERIMENTAL 36 depends on !SH_FPU
37 help 37 help
38 Selecting this option will enable support for software FPU emulation. 38 Selecting this option will enable support for software FPU emulation.
39 Most SH-3 users will want to say Y here, whereas most SH-4 users will 39 Most SH-3 users will want to say Y here, whereas most SH-4 users will
@@ -68,7 +68,6 @@ config SH_STORE_QUEUES
68 68
69config SPECULATIVE_EXECUTION 69config SPECULATIVE_EXECUTION
70 bool "Speculative subroutine return" 70 bool "Speculative subroutine return"
71 depends on EXPERIMENTAL
72 depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786 71 depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786
73 help 72 help
74 This enables support for a speculative instruction fetch for 73 This enables support for a speculative instruction fetch for