diff --git a/[refs] b/[refs]
index 2de6252f9075..4a514de724a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8492090542b8bc6b65b60ccf0b49ff8f0a460ab2
+refs/heads/master: 602da297e293eb2cbd28dcdbbe247593a46a853a
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index e4135d6e0556..0ec612959042 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -125,8 +125,8 @@ struct ide_io_ports {
  * Timeouts for various operations:
  */
 enum {
-	/* spec allows up to 20ms */
-	WAIT_DRQ	= HZ / 10,	/* 100ms */
+	/* spec allows up to 20ms, but CF cards and SSD drives need more */
+	WAIT_DRQ	= 1 * HZ,	/* 1s */
 	/* some laptops are very slow */
 	WAIT_READY	= 5 * HZ,	/* 5s */
 	/* should be less than 3ms (?), if all ATAPI CD is closed at boot */