diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:40:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:40:39 -0400 |
| commit | 36a557d1f48669c57f59e37d9334400a29e4e53c (patch) | |
| tree | 6d97b3eb9fefa6a82dd11dd7caeb799f986bdc48 /Documentation | |
| parent | 4e8f10b7ccf1c3c53a818a157962074a7340732e (diff) | |
| parent | 6665bda76461308868bd1e52caf627f4cb29ed32 (diff) | |
Pull trivial into release branch
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
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. | |||
| 147 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA | 147 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA |
| 148 | Format: <irq>,<irq>... | 148 | Format: <irq>,<irq>... |
| 149 | 149 | ||
| 150 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS | ||
| 151 | Format: To spoof as Windows 98: ="Microsoft Windows" | ||
| 152 | |||
| 150 | acpi_osi= [HW,ACPI] empty param disables _OSI | 153 | acpi_osi= [HW,ACPI] empty param disables _OSI |
| 151 | 154 | ||
| 152 | acpi_serialize [HW,ACPI] force serialization of AML methods | 155 | acpi_serialize [HW,ACPI] force serialization of AML methods |