Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ad36a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 8b9fc8ae 729d4de9

drivers/ide/ide-iops.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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)

	 */

	 */

drivers/ide/ide-probe.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -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);

include/linux/ide.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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