Merge /spare/repo/netdev-2.6 branch 'ieee80211'

[linux-2.6] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 67e99f144199242d69df27f3e43a72aa2518b42f..4ec75c06bca4b0945b856582ebcd9d84f4c368f8 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -437,10 +437,6 @@ running once the system is up.
                        Format: {"of[f]" | "sk[ipmbr]"}
                        See comment in arch/i386/boot/edd.S
 
-       edd             [EDD]
-                       Format: {"of[f]" | "sk[ipmbr]"}
-                       See comment in arch/i386/boot/edd.S
-
        eicon=          [HW,ISDN] 
                        Format: <id>,<membase>,<irq>