Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: make legacy IDE VLB modules check for the "probe" kernel params (v2)
  ide: remove some obsoleted kernel params (v2)
  ide/pci/delkin_cb.c: pci_module_init to pci_register_driver
  scc_pata: bugfix for checking DMA IRQ status
  ide: remove a ton of pointless #undef REALLY_SLOW_IO
  siimage: DRAC4 note
  adjust legacy IDE resource setting (v2)
  ide: fix pmac breakage
  ide-cs: Update device table
  ide: ide_get_best_pio_mode() returns incorrect IORDY setting (take 2)
  piix/slc90e66: more tuneproc() fixing (take 2)
  ide: fix drive side 80c cable check, take 2
  cmd64x: fix PIO mode setup (take 3)
  alim15x3: fix PIO mode setup

1 files changed, 12 insertions, 17 deletions

diff --git a/Documentation/ide.txt b/Documentation/ide.txt
index 786c3a766995..3bb9f9c98611 100644
--- a/Documentation/ide.txt
+++ b/Documentation/ide.txt
@@ -232,7 +232,9 @@ Summary of ide driver parameters for kernel command line
 
  "hdx=remap63"          : remap the drive: add 63 to all sector numbers
                           (for DM OnTrack)
- 
+
+ "idex=noautotune"      : driver will NOT attempt to tune interface speed
+
  "hdx=autotune"         : driver will attempt to tune interface speed
                           to the fastest PIO mode supported,
                           if possible for this drive only.
@@ -267,17 +269,6 @@ Summary of ide driver parameters for kernel command line
  "idex=base,ctl"        : specify both base and ctl
 
  "idex=base,ctl,irq"    : specify base, ctl, and irq number
- 
- "idex=autotune"        : driver will attempt to tune interface speed
-                          to the fastest PIO mode supported,
-                          for all drives on this interface.
-                          Not fully supported by all chipset types,
-                          and quite likely to cause trouble with
-                          older/odd IDE drives.
-
- "idex=noautotune"      : driver will NOT attempt to tune interface speed 
-                          This is the default for most chipsets,
-                          except the cmd640.
 
  "idex=serialize"       : do not overlap operations on idex. Please note
                           that you will have to specify this option for
@@ -303,13 +294,8 @@ 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
 
@@ -317,6 +303,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