From 80cedfc25631487593e5ac85f779a48dc875d6f6 Mon Sep 17 00:00:00 2001 From: Ben Gardner Date: Tue, 23 Feb 2010 12:41:22 -0600 Subject: [PATCH] --- yaml --- r: 183183 b: refs/heads/master c: 4b7d1c0509d0d07edc731f990791dc5518e51617 h: refs/heads/master i: 183181: 8d82401198a188f623c6dc906d9a882e8f26a009 183179: 1a771b298de8d72edd2cb8479d2a38085e47845b 183175: 2ebe904e48972c91a96835ac3b999ceae87d49b8 183167: 2757de75fec6f1e470a7de27ae4114160be6d4af v: v3 --- [refs] | 2 +- trunk/include/linux/ata.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 60bf75cec251..2100e13df112 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e044a12c73f474e59f1ddecf08d6781c7830f0f +refs/heads/master: 4b7d1c0509d0d07edc731f990791dc5518e51617 diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h index 20f31567ccee..b4c85e2adef5 100644 --- a/trunk/include/linux/ata.h +++ b/trunk/include/linux/ata.h @@ -841,7 +841,8 @@ static inline int ata_id_current_chs_valid(const u16 *id) static inline int ata_id_is_cfa(const u16 *id) { - if (id[ATA_ID_CONFIG] == 0x848A) /* Traditional CF */ + if ((id[ATA_ID_CONFIG] == 0x848A) || /* Traditional CF */ + (id[ATA_ID_CONFIG] == 0x844A)) /* Delkin Devices CF */ return 1; /* * CF specs don't require specific value in the word 0 anymore and yet