From: Jeff Garzik Date: Tue, 13 Dec 2005 06:47:05 +0000 (-0500) Subject: Merge branch 'upstream' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d1397f837647d8b6b3c9253a7e713d203f3cbb26;p=linux-beck.git Merge branch 'upstream' --- d1397f837647d8b6b3c9253a7e713d203f3cbb26 diff --cc include/linux/libata.h index 1be43be5b1d6,46337e71613e..b77f156e5768 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@@ -134,8 -133,10 +134,12 @@@ enum ATA_TMOUT_PIO = 30 * HZ, ATA_TMOUT_BOOT = 30 * HZ, /* hueristic */ ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* hueristic */ + ATA_TMOUT_DATAOUT = 30 * HZ, + ATA_TMOUT_DATAOUT_QUICK = 5 * HZ, + ATA_TMOUT_CDB = 30 * HZ, + ATA_TMOUT_CDB_QUICK = 5 * HZ, + ATA_TMOUT_INTERNAL = 30 * HZ, + ATA_TMOUT_INTERNAL_QUICK = 5 * HZ, /* ATA bus states */ BUS_UNKNOWN = 0,