arch/m68k: remove CONFIG_EXPERIMENTAL

This 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.

CC: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
index ffc0601a2a19f2a0d195bc750e21ef23cd4a0d23..93ef0346b209c961606c31acfe6791c710721aed 100644 (file)
--- a/arch/m68k/Kconfig.bus
+++ b/arch/m68k/Kconfig.bus
@@ -28,8 +28,8 @@ config ZORRO
          Linux use these.
 
 config AMIGA_PCMCIA
-       bool "Amiga 1200/600 PCMCIA support (EXPERIMENTAL)"
-       depends on AMIGA && EXPERIMENTAL
+       bool "Amiga 1200/600 PCMCIA support"
+       depends on AMIGA
        help
          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
          600. If you intend to use pcmcia cards say Y; otherwise say N.

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index c4eb79edecec04d58d5ad681c389118a3472cec5..2f2d87b40341fc859506a2a3489faefeb60d902f 100644 (file)
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -274,9 +274,8 @@ endif # COLDFIRE
 comment "Processor Specific Options"
 
 config M68KFPU_EMU
-       bool "Math emulation support (EXPERIMENTAL)"
+       bool "Math emulation support"
        depends on MMU
-       depends on EXPERIMENTAL
        help
          At some point in the future, this will cause floating-point math
          instructions to be emulated by the kernel on machines that lack a

diff --git a/arch/m68k/Kconfig.debug b/arch/m68k/Kconfig.debug
index 87233acef18bea1d20a8f67b471bfd7654f56ff0..fa12283d58fccdd0f92638ff75996bf8debc845a 100644 (file)
--- a/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@ -41,7 +41,7 @@ config NO_KERNEL_MSG
 
 config BDM_DISABLE
        bool "Disable BDM signals"
-       depends on (EXPERIMENTAL && COLDFIRE)
+       depends on COLDFIRE
        help
          Disable the ColdFire CPU's BDM signals.
 

diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index 04a3d9be90e946b27c7407b7a033712c15695d37..c4cdfe444c64817f01eac43b561ab6096e44ae24 100644 (file)
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -60,8 +60,8 @@ endmenu
 menu "Character devices"
 
 config ATARI_DSP56K
-       tristate "Atari DSP56k support (EXPERIMENTAL)"
-       depends on ATARI && EXPERIMENTAL
+       tristate "Atari DSP56k support"
+       depends on ATARI
        help
          If you want to be able to use the DSP56001 in Falcons, say Y. This
          driver is still experimental, and if you don't know what it is, or
@@ -87,7 +87,7 @@ config HPDCA
 
 config HPAPCI
        tristate "HP APCI serial support"
-       depends on HP300 && SERIAL_8250 && EXPERIMENTAL
+       depends on HP300 && SERIAL_8250
        help
          If you want to use the internal "APCI" serial ports on an HP400
          machine, say Y here.