Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[linux-beck.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index bb3a53cdfbc3153c7a30265498afd814ab72bfc8..503d21216d58195ece5d6892e8fa871cac9f7a18 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,6 +6,35 @@ be removed from this file.
 
 ---------------------------
 
+What:  PRISM54
+When:  2.6.34
+
+Why:   prism54 FullMAC PCI / Cardbus devices used to be supported only by the
+       prism54 wireless driver. After Intersil stopped selling these
+       devices in preference for the newer more flexible SoftMAC devices
+       a SoftMAC device driver was required and prism54 did not support
+       them. The p54pci driver now exists and has been present in the kernel for
+       a while. This driver supports both SoftMAC devices and FullMAC devices.
+       The main difference between these devices was the amount of memory which
+       could be used for the firmware. The SoftMAC devices support a smaller
+       amount of memory. Because of this the SoftMAC firmware fits into FullMAC
+       devices's memory. p54pci supports not only PCI / Cardbus but also USB
+       and SPI. Since p54pci supports all devices prism54 supports
+       you will have a conflict. I'm not quite sure how distributions are
+       handling this conflict right now. prism54 was kept around due to
+       claims users may experience issues when using the SoftMAC driver.
+       Time has passed users have not reported issues. If you use prism54
+       and for whatever reason you cannot use p54pci please let us know!
+       E-mail us at: linux-wireless@vger.kernel.org
+
+       For more information see the p54 wiki page:
+
+       http://wireless.kernel.org/en/users/Drivers/p54
+
+Who:   Luis R. Rodriguez <lrodriguez@atheros.com>
+
+---------------------------
+
 What:  IRQF_SAMPLE_RANDOM
 Check: IRQF_SAMPLE_RANDOM
 When:  July 2009
@@ -217,31 +246,6 @@ Who:       Thomas Gleixner <tglx@linutronix.de>
 ---------------------------
 
 What (Why):
-       - include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files
-         (superseded by xt_TOS/xt_tos target & match)
-
-       - "forwarding" header files like ipt_mac.h in
-         include/linux/netfilter_ipv4/ and include/linux/netfilter_ipv6/
-
-       - xt_CONNMARK match revision 0
-         (superseded by xt_CONNMARK match revision 1)
-
-       - xt_MARK target revisions 0 and 1
-         (superseded by xt_MARK match revision 2)
-
-       - xt_connmark match revision 0
-         (superseded by xt_connmark match revision 1)
-
-       - xt_conntrack match revision 0
-         (superseded by xt_conntrack match revision 1)
-
-       - xt_iprange match revision 0,
-         include/linux/netfilter_ipv4/ipt_iprange.h
-         (superseded by xt_iprange match revision 1)
-
-       - xt_mark match revision 0
-         (superseded by xt_mark match revision 1)
-
        - xt_recent: the old ipt_recent proc dir
          (superseded by /proc/net/xt_recent)