Skip to content

Commit

Permalink
arch/m68k: remove CONFIG_EXPERIMENTAL
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kees authored and geertu committed Nov 14, 2012
1 parent 77b6706 commit 112f8b1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions arch/m68k/Kconfig.bus
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions arch/m68k/Kconfig.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions arch/m68k/Kconfig.devices
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit 112f8b1

Please sign in to comment.