diff --git a/[refs] b/[refs]
index 1e479b468215..038b9cecb649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 537166f6fa282c683663d6ac0c631b7456b5be95
+refs/heads/master: 938da770c205989945ba4cc5f0b4e255702061a1
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index 87532034d105..3f9e10001e19 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -1031,7 +1031,7 @@ comment "Other IDE chipsets support"
 comment "Note: most of these also require special kernel boot parameters"
 
 config BLK_DEV_4DRIVES
-	bool "Generic 4 drives/port support"
+	tristate "Generic 4 drives/port support"
 	help
 	  Certain older chipsets, including the Tekram 690CD, use a single set
 	  of I/O ports at 0x1f0 to control up to four drives, instead of the