[LRO]: fix lro_gen_skb() alignment

[linux-2.6] / Documentation / ide.txt

diff --git a/Documentation/ide.txt b/Documentation/ide.txt
index c1640e306c53b200ebb992e28a9476aa8347c829..1d50f23a5cab092b237f09b21ff873f334224782 100644 (file)
--- a/Documentation/ide.txt
+++ b/Documentation/ide.txt
@@ -242,6 +242,8 @@ Summary of ide driver parameters for kernel command line
                          and quite likely to cause trouble with
                          older/odd IDE drives.
 
+ "hdx=nodma"           : disallow DMA
+
  "hdx=swapdata"                : when the drive is a disk, byte swap all data
 
  "hdx=bswap"           : same as above..........
@@ -286,8 +288,6 @@ 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.