Merge branch 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemo...

[cascardo/linux.git] / Documentation / kernel-parameters.txt
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt

index 9a5b665..508e2a2 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
@@ -735,6 +732,8 @@ and is between 256 and 4096 characters. It is defined in the file
                              (Don't attempt to blink the leds)
         i8042.noaux     [HW] Don't check for auxiliary (== mouse) port
         i8042.nokbd     [HW] Don't check/create keyboard port
+       i8042.noloop    [HW] Disable the AUX Loopback command while probing
+                            for the AUX port
         i8042.nomux     [HW] Don't check presence of an active multiplexing
                              controller
         i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
@@ -766,14 +765,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
@@ -1131,6 +1130,10 @@ and is between 256 and 4096 characters. It is defined in the file
         memmap=nn[KMG]$ss[KMG]
                         [KNL,ACPI] Mark specific memory as reserved.
                         Region of memory to be used, from ss to ss+nn.
+                       Example: Exclude memory from 0x18690000-0x1869ffff
+                                memmap=64K$0x18690000
+                                or
+                                memmap=0x10000$0x18690000
  
         meye.*=         [HW] Set MotionEye Camera parameters
                         See Documentation/video4linux/meye.txt.