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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
Revert "ide: try to use PIO Mode 0 during probe if possible"

-9
-9
drivers/ide/ide-probe.c
··· 1046 if (port_ops && port_ops->init_dev) 1047 port_ops->init_dev(drive); 1048 } 1049 - 1050 - ide_port_for_each_dev(i, drive, hwif) { 1051 - /* 1052 - * default to PIO Mode 0 before we figure out 1053 - * the most suited mode for the attached device 1054 - */ 1055 - if (port_ops && port_ops->set_pio_mode) 1056 - port_ops->set_pio_mode(drive, 0); 1057 - } 1058 } 1059 1060 static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
··· 1046 if (port_ops && port_ops->init_dev) 1047 port_ops->init_dev(drive); 1048 } 1049 } 1050 1051 static void ide_init_port(ide_hwif_t *hwif, unsigned int port,