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

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

---

 Documentation/feature-removal-schedule.txt |   16 ++++++++++++++++
 drivers/pcmcia/Kconfig                     |   14 +++++---------

Index: 2.6.12-git10/Documentation/feature-removal-schedule.txt
===================================================================
--- 2.6.12-git10.orig/Documentation/feature-removal-schedule.txt
+++ 2.6.12-git10/Documentation/feature-removal-schedule.txt
@@ -119,3 +119,19 @@ Why:	Match the other drivers' name for t
 	will be available until removal of old names.
 Who:	Grant Coady <gcoady@gmail.com>
 
+---------------------------
+
+What:	PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
+When:	November 2005
+Files:	drivers/pcmcia/: pcmcia_ioctl.c
+Why:	With the 16-bit PCMCIA subsystem now behaving (almost) like a
+	normal hotpluggable bus, and with it using the default kernel
+	infrastructure (hotplug, driver core, sysfs) keeping the PCMCIA
+	control ioctl needed by cardmgr and cardctl from pcmcia-cs is
+	unnecessary, obstructs further cleanups and integration of the
+	PCMCIA subsystem into the Linux kernel device driver model. The
+	features provided by cardmgr and cardctl are either handled by
+	the kernel itself now or are available in the new pcmciautils
+	package available at 
+	http://kernel.org/pub/linux/utils/kernel/pcmcia/
+Who:	Dominik Brodowski <linux@brodo.de>
Index: 2.6.12-git10/drivers/pcmcia/Kconfig
===================================================================
--- 2.6.12-git10.orig/drivers/pcmcia/Kconfig
+++ 2.6.12-git10/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.