diff options
author | Len Brown <len.brown@intel.com> | 2006-01-06 16:34:21 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-06 16:34:21 -0500 |
commit | 25da0974601fc8096461f3d3f7ca3aab8e79adfb (patch) | |
tree | f9b3c1bfbc63fdb6a94e82177b8c3ae891125422 /Documentation/kernel-parameters.txt | |
parent | 036d25f79ddfbc9878da24ef8e468a6d22caa605 (diff) | |
parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) |
Auto-update from upstream
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 6e9f1dc26884..06e362b2d5b8 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -633,6 +633,14 @@ running once the system is up. | |||
633 | inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver | 633 | inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver |
634 | Format: <irq> | 634 | Format: <irq> |
635 | 635 | ||
636 | combined_mode= [HW] control which driver uses IDE ports in combined | ||
637 | mode: legacy IDE driver, libata, or both | ||
638 | (in the libata case, libata.atapi_enabled=1 may be | ||
639 | useful as well). Note that using the ide or libata | ||
640 | options may affect your device naming (e.g. by | ||
641 | changing hdc to sdb). | ||
642 | Format: combined (default), ide, or libata | ||
643 | |||
636 | inttest= [IA64] | 644 | inttest= [IA64] |
637 | 645 | ||
638 | io7= [HW] IO7 for Marvel based alpha systems | 646 | io7= [HW] IO7 for Marvel based alpha systems |