diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 16:51:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 16:51:36 +0100 |
| commit | a2e28fc1164e56d37a56e3c53bd3e5a64462fd02 (patch) | |
| tree | 144dfddbd6d619db549bf43e43ddc116f29e9774 /Documentation | |
| parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| parent | pcmcia: disable pcmcia ioctl for !ARM, prepare for removal (diff) | |
| download | linux-a2e28fc1164e56d37a56e3c53bd3e5a64462fd02.tar.xz linux-a2e28fc1164e56d37a56e3c53bd3e5a64462fd02.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: disable pcmcia ioctl for !ARM, prepare for removal
pcmcia: CodingStyle fixes
pcmcia: alchemy: fixup wrong comments
pcmcia: remove irq_list parameter from pd6729
yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 73ef30dbe612..03497909539e 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -117,19 +117,25 @@ Who: Mauro Carvalho Chehab <mchehab@infradead.org> --------------------------- What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl]) -When: November 2005 +When: 2.6.35/2.6.36 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, and makes further cleanups and integration of the + unnecessary and potentially harmful (it does not provide for + proper locking), and makes further cleanups and integration of the PCMCIA subsystem into the Linux kernel device driver model more difficult. 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> + + For all architectures except ARM, the associated config symbol + has been removed from kernel 2.6.34; for ARM, it will be likely + be removed from kernel 2.6.35. The actual code will then likely + be removed from kernel 2.6.36. +Who: Dominik Brodowski <linux@dominikbrodowski.net> --------------------------- |