diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
| commit | 1dbbb6077426f8ce63d6a59c5ac6613e1689cbde (patch) | |
| tree | 6141d4d7a8eb7c557705bdfa764137d4fd2e4924 /Documentation/kernel-parameters.txt | |
| parent | d09e860cf07e7c9ee12920a09f5080e30a12a23a (diff) | |
| parent | 064922a805ec7aadfafdd27aa6b4908d737c3c1d (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index bf6303ec0bde..e5f3d918316f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -772,10 +772,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 772 | Format: ide=nodma or ide=doubler | 772 | Format: ide=nodma or ide=doubler |
| 773 | See Documentation/ide/ide.txt. | 773 | See Documentation/ide/ide.txt. |
| 774 | 774 | ||
| 775 | ide?= [HW] (E)IDE subsystem | ||
| 776 | Format: ide?=ata66 or chipset specific parameters. | ||
| 777 | See Documentation/ide/ide.txt. | ||
| 778 | |||
| 779 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed | 775 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed |
| 780 | See Documentation/ide/ide.txt. | 776 | See Documentation/ide/ide.txt. |
| 781 | 777 | ||