diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-29 23:23:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-29 23:23:01 -0800 |
| commit | 96b61dfd1452cd96ed9250bbc776656919599d73 (patch) | |
| tree | 9316f06ba3531bfd4a4162f07610285e97872b9d /Documentation | |
| parent | bffac3b3f1c99d1b607eb3749eb338f0c3da7e22 (diff) | |
| parent | b3d1aca187a86cc9c3515afaaa2018c9e845c4cd (diff) | |
| download | history-96b61dfd1452cd96ed9250bbc776656919599d73.tar.gz | |
Merge bk://bart.bkbits.net/ide-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ide.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/ide.txt b/Documentation/ide.txt index 12c7a2fd6ef346..29866fbfb229d2 100644 --- a/Documentation/ide.txt +++ b/Documentation/ide.txt @@ -297,6 +297,8 @@ Summary of ide driver parameters for kernel command line "ide=reverse" : formerly called to pci sub-system, but now local. + "ide=nodma" : disable DMA globally for the IDE subsystem. + The following are valid ONLY on ide0, which usually corresponds to the first ATA interface found on the particular host, and the defaults for the base,ctl ports must not be altered. |