Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / Documentation / ide.txt

diff --git a/Documentation/ide.txt b/Documentation/ide.txt
index 82349f5..1d50f23 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..........
@@ -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,19 +288,12 @@ 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.
 
- "ide0=dtc2278"                : probe/support DTC2278 interface
- "ide0=ht6560b"                : probe/support HT6560B interface
  "ide0=cmd640_vlb"     : *REQUIRED* for VLB cards with the CMD640 chip
                          (not for PCI -- automatically detected)
- "ide0=qd65xx"         : probe/support qd65xx interface
- "ide0=ali14xx"                : probe/support ali14xx chipsets (ALI M1439/M1443/M1445)
- "ide0=umc8672"                : probe/support umc8672 chipsets
 
  "ide=doubler"         : probe/support IDE doublers on Amiga
 
@@ -308,6 +301,15 @@ There may be more options than shown -- use the source, Luke!
 
 Everything else is rejected with a "BAD OPTION" message.
 
+For legacy IDE VLB host drivers (ali14xx/dtc2278/ht6560b/qd65xx/umc8672)
+you need to explicitly enable probing by using "probe" kernel parameter,
+i.e. to enable probing for ALI M14xx chipsets (ali14xx host driver) use:
+
+* "ali14xx.probe" boot option when ali14xx driver is built-in the kernel
+
+* "probe" module parameter when ali14xx driver is compiled as module
+  ("modprobe ali14xx probe")
+
 ================================================================================
 
 IDE ATAPI streaming tape driver