Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / Documentation / kernel-parameters.txt
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt

index 4720f8ca211a1a61546cd07b7f5b7713dedd1c2b..312fe77764a48cba9fb04e000fc2dffeba7fa978 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -758,9 +758,6 @@ and is between 256 and 4096 characters. It is defined in the file
         hd=             [EIDE] (E)IDE hard drive subsystem geometry
                         Format: <cyl>,<head>,<sect>
  
-       hd?=            [HW] (E)IDE subsystem
-       hd?lun=         See Documentation/ide/ide.txt.
-
         highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
                         size of <nn>. This works even on boxes that have no
                         highmem otherwise. This also works to reduce highmem