tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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"

Linus Torvalds 62ad36a8 8b9fc8ae

+5 -3
unified split
+1
drivers/ide/ide-iops.c
··· 595 596 /* 597 * FIXME: 598 * - force bit13 (80c cable present) check also for !ivb devices 599 * (unless the slave device is pre-ATA3) 600 */
··· 595 596 /* 597 * FIXME: 598 + * - change master/slave IDENTIFY order 599 * - force bit13 (80c cable present) check also for !ivb devices 600 * (unless the slave device is pre-ATA3) 601 */
+3 -2
drivers/ide/ide-probe.c
··· 774 printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name); 775 776 /* 777 - * Need to probe slave device first to make it release PDIAG-. 778 */ 779 - for (unit = MAX_DRIVES - 1; unit >= 0; unit--) { 780 ide_drive_t *drive = &hwif->drives[unit]; 781 drive->dn = (hwif->channel ? 2 : 0) + unit; 782 (void) probe_for_drive(drive);
··· 774 printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name); 775 776 /* 777 + * Second drive should only exist if first drive was found, 778 + * but a lot of cdrom drives are configured as single slaves. 779 */ 780 + for (unit = 0; unit < MAX_DRIVES; ++unit) { 781 ide_drive_t *drive = &hwif->drives[unit]; 782 drive->dn = (hwif->channel ? 2 : 0) + unit; 783 (void) probe_for_drive(drive);
+1 -1
include/linux/ide.h
··· 26 #include <asm/semaphore.h> 27 #include <asm/mutex.h> 28 29 - #if defined(CRIS) || defined(FRV) 30 # define SUPPORT_VLB_SYNC 0 31 #else 32 # define SUPPORT_VLB_SYNC 1
··· 26 #include <asm/semaphore.h> 27 #include <asm/mutex.h> 28 29 + #if defined(CONFIG_CRIS) || defined(CONFIG_FRV) 30 # define SUPPORT_VLB_SYNC 0 31 #else 32 # define SUPPORT_VLB_SYNC 1