2.6.24

 Documentation

diff --git a/Documentation/ide.txt b/Documentation/ide.txt
index 3bb9f9c..1d50f23 100644
--- 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..........
@@ -278,8 +280,6 @@ Summary of ide driver parameters for kernel command line
  "idex=four"      : four drives on idex and ide(x^1) share same ports
          
  "idex=reset"      : reset interface after probe
- 
- "idex=dma"      : automatically configure/use DMA if possible.
 
  "idex=ata66"      : informs the interface that it has an 80c cable
            for chipsets that are ATA-66 capable, but the
@@ -288,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.