diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-27 09:04:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-27 09:04:43 +0100 |
| commit | f701d354075914296474d062f18fc8ee681a2318 (patch) | |
| tree | 4c39db49f4bc9827a1a0dabc6a83fb30bd2c7ac4 /Documentation | |
| parent | Merge branch 'sched/clock' into tracing/ftrace (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| download | linux-f701d354075914296474d062f18fc8ee681a2318.tar.xz linux-f701d354075914296474d062f18fc8ee681a2318.zip | |
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 icn= [HW,ISDN] Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]] - ide= [HW] (E)IDE subsystem - Format: ide=nodma or ide=doubler + ide-core.nodma= [HW] (E)IDE subsystem + Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc + .vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom + .chs .ignore_cable are additional options See Documentation/ide/ide.txt. idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed |