aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-12 00:17:59 -0400
committerLen Brown <len.brown@intel.com>2007-08-12 00:17:59 -0400
commit53fdc5185c994ad6def3729a905ac4a47c477c9d (patch)
tree7082144a6e0f9b18c0a4027119d69c75d1c242f7 /Documentation
parent3b6919e536865703a0d5c823f5a34c86cedd07cf (diff)
parent67effe8fff32f60bdf51cba484766ba6003005bb (diff)
downloadlinux-linaro-53fdc5185c994ad6def3729a905ac4a47c477c9d.tar.gz
Pull bugzilla-3774 into release branch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a326487a3ab..09c0ec100f6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -163,6 +163,8 @@ and is between 256 and 4096 characters. It is defined in the file
acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
Format: <irq>,<irq>...
+ acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT
+
acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS
Format: To spoof as Windows 98: ="Microsoft Windows"