---

yaml --- r: 183183 b: refs/heads/master c: 4b7d1c0 h: refs/heads/master i: 183181: 8d82401 183179: 1a771b2 183175: 2ebe904 183167: 2757de7 v: v3
git-mirror · Mar 1, 2010 · 80cedfc · 80cedfc
1 parent 4608fbf
commit 80cedfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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