diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-07 12:27:11 (GMT) |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-07 12:27:11 (GMT) |
| commit | 6250d3af2a1036fb356264442211a4246c7d64c7 (patch) | |
| tree | 12474d59b96c0dc518159cb694f0e654cb18b5f6 /Documentation/kernel-parameters.txt | |
| parent | 4c9773ed7946fc375edba057770f5ef16d8b44fe (diff) | |
| parent | 075affcbe01d4d7cefcd0e30a98df1253bcf8d92 (diff) | |
| download | linux-fsl-qoriq-6250d3af2a1036fb356264442211a4246c7d64c7.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a19f021..e58c91c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -835,11 +835,8 @@ and is between 256 and 4096 characters. It is defined in the file 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 + .vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr + .cdrom .chs .ignore_cable are additional options See Documentation/ide/ide.txt. ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem |