diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:32:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:32:33 -0500 |
| commit | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (patch) | |
| tree | 3c8d1716cd53ed77a935036090323a1ae9a7963b /Documentation | |
| parent | d779188d2baf436e67fe8816fca2ef53d246900f (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'Documentation')
| -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 5dffcfefc3c7..61a56b100c62 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 |