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