diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-23 04:15:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-23 04:15:15 +0300 |
| commit | 33e2bf6aa16061bae1253514e7c32af27d2b4b31 (patch) | |
| tree | 652d13b4feea9a8f562186e7badae72d2e22fe1f /Documentation/feature-removal-schedule.txt | |
| parent | e880eb6c5c9d98e389ffc0d8947f75d70785361a (diff) | |
| parent | 819bfecc4fc6b6e5a793f719a45b7146ce423b79 (diff) | |
| download | linux-33e2bf6aa16061bae1253514e7c32af27d2b4b31.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index ed511af0f79a..267e90582d20 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -520,6 +520,7 @@ Who: Hans de Goede <hdegoede@redhat.com> ---------------------------- + What: corgikbd, spitzkbd, tosakbd driver When: 2.6.35 Files: drivers/input/keyboard/{corgi,spitz,tosa}kbd.c @@ -543,6 +544,24 @@ Who: Eric Miao <eric.y.miao@gmail.com> ---------------------------- +What: sysfs-class-rfkill state file +When: Feb 2014 +Files: net/rfkill/core.c +Why: Documented as obsolete since Feb 2010. This file is limited to 3 + states while the rfkill drivers can have 4 states. +Who: anybody or Florian Mickler <florian@mickler.org> + +---------------------------- + +What: sysfs-class-rfkill claim file +When: Feb 2012 +Files: net/rfkill/core.c +Why: It is not possible to claim an rfkill driver since 2007. This is + Documented as obsolete since Feb 2010. +Who: anybody or Florian Mickler <florian@mickler.org> + +---------------------------- + What: capifs When: February 2011 Files: drivers/isdn/capi/capifs.* |