[PATCH] pcmcia: deprecate ioctl

Schedule removal of the PCMCIA ioctl (and thus kernel support for the
pcmcia-cs userspace package) for November 2005.

A big "thank you" to Dave Hinds for his great work on supporting PCMCIA in
Linux.  Things are just done differently by now, so the ongoing work to make
PCMCIA behave like any other hotpluggable bus should continue.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 52ea34594363..bb4dd2735d70 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -1,8 +1,5 @@
 #
-# PCMCIA bus subsystem configuration
-#
-# Right now the non-CardBus choices are not supported
-# by the integrated kernel driver.
+# PCCARD (PCMCIA/CardBus) bus subsystem configuration
 #
 
 menu "PCCARD (PCMCIA/CardBus) support"
@@ -32,7 +29,7 @@ config PCMCIA_DEBUG
 
           The kernel command line options are:
             pcmcia_core.pc_debug=N
-            ds.pc_debug=N
+            pcmcia.pc_debug=N
             sa11xx_core.pc_debug=N
 
           The module option is called pc_debug=N
@@ -73,7 +70,7 @@ config PCMCIA_LOAD_CIS
           If unsure, say Y.
 
 config PCMCIA_IOCTL
-        bool
+        bool "PCMCIA control ioctl (obsolete)"
         depends on PCMCIA
         default y
         help
@@ -81,9 +78,8 @@ config PCMCIA_IOCTL
           subsystem will be built. It is needed by cardmgr and cardctl
           (pcmcia-cs) to function properly.
 
-          If you do not use the new pcmciautils package, and have a
-          yenta, Cirrus PD6729, i82092, i82365 or tcic compatible bridge,
-          you need to say Y here to be able to use 16-bit PCMCIA cards.
+          You should use the new pcmciautils package instead (see
+          <file:Documentation/Changes> for location and details).
 
           If unsure, say Y.