diff --git a/[refs] b/[refs]
index c2855a2eb880..077e532a68b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85ae98a3dff2da860a4f8f9e4a0de69ad82ce633
+refs/heads/master: ffa793f9bb5b563edb4cacc43a4d6677eec0e36b
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index 21511d47d926..39b95f9c2ad1 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -1000,7 +1000,7 @@ config BLK_DEV_IDEDMA
 
 endif
 
-config BLK_DEV_HD_ONLY
+config BLK_DEV_HD
 	bool "Old hard disk (MFM/RLL/IDE) driver"
 	depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
 	help
@@ -1023,7 +1023,4 @@ config BLK_DEV_HD_ONLY
 	  Disk-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
 
-config BLK_DEV_HD
-	def_bool BLK_DEV_HD_ONLY
-
 endif # IDE