diff --git a/[refs] b/[refs]
index a67821db6078..e1ff264303c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 944000921d41c5aacfda6515ad3a0bbde52f8fa3
+refs/heads/master: ac87e41116c229fc1efaac0d17fdbfb2185e4629
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index ee01e273a537..2a584b3f1813 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -327,6 +327,7 @@ config BLK_DEV_PLATFORM
 config BLK_DEV_CMD640
 	bool "CMD640 chipset bugfix/support"
 	depends on X86
+	select IDE_GENERIC
 	---help---
 	  The CMD-Technologies CMD640 IDE chip is used on many common 486 and
 	  Pentium motherboards, usually in combination with a "Neptune" or