diff --git a/[refs] b/[refs]
index aa8c7d8d539f..db7fb96590b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f7577434bcdf99456757b44d8911dc6e51c3178
+refs/heads/master: 121a09e590d54be840289c6feac840453aa999d9
diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h
index 72ab80801ef6..e672e80202a8 100644
--- a/trunk/include/linux/ata.h
+++ b/trunk/include/linux/ata.h
@@ -554,8 +554,6 @@ static inline int ata_drive_40wire(const u16 *dev_id)
 
 static inline int ata_drive_40wire_relaxed(const u16 *dev_id)
 {
-	if (ata_id_is_sata(dev_id))
-		return 0;	/* SATA */
 	if ((dev_id[93] & 0x2000) == 0x2000)
 		return 0;	/* 80 wire */
 	return 1;