Pull sony into release branch

[linux-2.6] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 18e401ff7eafb6ed6fee60693e65b1c35b3254a8..272736e37990b7d96b71d7f4b0972ee2d7033d77 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -352,7 +352,7 @@ static inline int ata_drive_40wire(const u16 *dev_id)
 {
        if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
                return 0;       /* SATA */
-       if (dev_id[93] & 0x4000)
+       if ((dev_id[93] & 0xE000) == 0x6000)
                return 0;       /* 80 wire */
        return 1;
 }