Revert "unexport bio_{,un}map_user"

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

index 9a5b6658c65e0ee4a6b55df39da68d5836e9889b..622f7849edb968024f6879927aa7c6a2e008f695 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -138,7 +138,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         strict -- Be less tolerant of platforms that are not
                                 strictly ACPI specification compliant.
  
-                       See also Documentation/pm.txt, pci=noacpi
+                       See also Documentation/power/pm.txt, pci=noacpi
  
         acpi_apic_instance=     [ACPI, IOAPIC]
                         Format: <int>
@@ -177,9 +177,6 @@ and is between 256 and 4096 characters. It is defined in the file
  
         acpi_no_auto_ssdt       [HW,ACPI] Disable automatic loading of SSDT
  
-       acpi_no_initrd_override [KNL,ACPI]
-                       Disable loading custom ACPI tables from the initramfs
-
         acpi_os_name=   [HW,ACPI] Tell ACPI BIOS the name of the OS
                         Format: To spoof as Windows 98: ="Microsoft Windows"
  
@@ -712,7 +709,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: <cyl>,<head>,<sect>
  
         hd?=            [HW] (E)IDE subsystem
-       hd?lun=         See Documentation/ide.txt.
+       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
@@ -766,14 +763,14 @@ and is between 256 and 4096 characters. It is defined in the file
  
         ide=            [HW] (E)IDE subsystem
                         Format: ide=nodma or ide=doubler or ide=reverse
-                       See Documentation/ide.txt.
+                       See Documentation/ide/ide.txt.
  
         ide?=           [HW] (E)IDE subsystem
                         Format: ide?=noprobe or chipset specific parameters.
-                       See Documentation/ide.txt.
+                       See Documentation/ide/ide.txt.
  
         idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
-                       See Documentation/ide.txt.
+                       See Documentation/ide/ide.txt.
  
         idle=           [X86]
                         Format: idle=poll or idle=mwait