summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 21:40:39 +0200
committerLen Brown <len.brown@intel.com>2006-06-15 21:40:39 +0200
commit36a557d1f48669c57f59e37d9334400a29e4e53c (patch)
tree6d97b3eb9fefa6a82dd11dd7caeb799f986bdc48 /Documentation/kernel-parameters.txt
parentPull novell-bugzilla-156426 into release branch (diff)
parent[ACPI] drivers/acpi/video.c: fix error path NULL pointer dereference (diff)
downloadlinux-36a557d1f48669c57f59e37d9334400a29e4e53c.tar.xz
linux-36a557d1f48669c57f59e37d9334400a29e4e53c.zip
Pull trivial into release branch
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b3a6187e5305..a853e8607865 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -147,6 +147,9 @@ running once the system is up.
acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
Format: <irq>,<irq>...
+ acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS
+ Format: To spoof as Windows 98: ="Microsoft Windows"
+
acpi_osi= [HW,ACPI] empty param disables _OSI
acpi_serialize [HW,ACPI] force serialization of AML methods