summaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-27 09:04:43 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-27 09:04:43 +0100
commitf701d354075914296474d062f18fc8ee681a2318 (patch)
tree4c39db49f4bc9827a1a0dabc6a83fb30bd2c7ac4 /Documentation/kernel-parameters.txt
parent1b49061d400c9e51e3ac2aac026a099fe599b9bb (diff)
parent64e71303e44f3697e4568147caa966de74bdb4fb (diff)
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt6
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