Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: fix defining SUPPORT_VLB_SYNC Revert "ide: change master/slave IDENTIFY order"
This commit is contained in:
commit
62ad36a8a6
3 changed files with 5 additions and 3 deletions
|
@ -595,6 +595,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FIXME:
|
* FIXME:
|
||||||
|
* - change master/slave IDENTIFY order
|
||||||
* - force bit13 (80c cable present) check also for !ivb devices
|
* - force bit13 (80c cable present) check also for !ivb devices
|
||||||
* (unless the slave device is pre-ATA3)
|
* (unless the slave device is pre-ATA3)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -774,9 +774,10 @@ static int ide_probe_port(ide_hwif_t *hwif)
|
||||||
printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
|
printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Need to probe slave device first to make it release PDIAG-.
|
* Second drive should only exist if first drive was found,
|
||||||
|
* but a lot of cdrom drives are configured as single slaves.
|
||||||
*/
|
*/
|
||||||
for (unit = MAX_DRIVES - 1; unit >= 0; unit--) {
|
for (unit = 0; unit < MAX_DRIVES; ++unit) {
|
||||||
ide_drive_t *drive = &hwif->drives[unit];
|
ide_drive_t *drive = &hwif->drives[unit];
|
||||||
drive->dn = (hwif->channel ? 2 : 0) + unit;
|
drive->dn = (hwif->channel ? 2 : 0) + unit;
|
||||||
(void) probe_for_drive(drive);
|
(void) probe_for_drive(drive);
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <asm/semaphore.h>
|
#include <asm/semaphore.h>
|
||||||
#include <asm/mutex.h>
|
#include <asm/mutex.h>
|
||||||
|
|
||||||
#if defined(CRIS) || defined(FRV)
|
#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)
|
||||||
# define SUPPORT_VLB_SYNC 0
|
# define SUPPORT_VLB_SYNC 0
|
||||||
#else
|
#else
|
||||||
# define SUPPORT_VLB_SYNC 1
|
# define SUPPORT_VLB_SYNC 1
|
||||||
|
|
Reference in a new issue