Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[can-eth-gw-linux.git] / arch / m68k / Kconfig.bus

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.