diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-27 03:04:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-27 03:04:43 -0500 |
| commit | f701d354075914296474d062f18fc8ee681a2318 (patch) | |
| tree | 4c39db49f4bc9827a1a0dabc6a83fb30bd2c7ac4 /Documentation | |
| parent | 1b49061d400c9e51e3ac2aac026a099fe599b9bb (diff) | |
| parent | 64e71303e44f3697e4568147caa966de74bdb4fb (diff) | |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4a7700876c96..4d7e001ec39d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -869,8 +869,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 869 | icn= [HW,ISDN] | 869 | icn= [HW,ISDN] |
| 870 | Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]] | 870 | Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]] |
| 871 | 871 | ||
| 872 | ide= [HW] (E)IDE subsystem | 872 | ide-core.nodma= [HW] (E)IDE subsystem |
| 873 | Format: ide=nodma or ide=doubler | 873 | Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc |
| 874 | .vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom | ||
| 875 | .chs .ignore_cable are additional options | ||
| 874 | See Documentation/ide/ide.txt. | 876 | See Documentation/ide/ide.txt. |
| 875 | 877 | ||
| 876 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed | 878 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed |