diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/ide/ide-iops.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/ide/ide-iops.c')
| -rw-r--r-- | drivers/ide/ide-iops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 222c1ef65fb9..376f2dc410c5 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -231,7 +231,7 @@ u8 eighty_ninty_three(ide_drive_t *drive) | |||
| 231 | u16 *id = drive->id; | 231 | u16 *id = drive->id; |
| 232 | int ivb = ide_in_drive_list(id, ivb_list); | 232 | int ivb = ide_in_drive_list(id, ivb_list); |
| 233 | 233 | ||
| 234 | if (hwif->cbl == ATA_CBL_PATA40_SHORT) | 234 | if (hwif->cbl == ATA_CBL_SATA || hwif->cbl == ATA_CBL_PATA40_SHORT) |
| 235 | return 1; | 235 | return 1; |
| 236 | 236 | ||
| 237 | if (ivb) | 237 | if (ivb) |