diff --git a/[refs] b/[refs]
index 8cbecc00c7f2..fa21cfdbd8e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 513f3c10ddb24b0a261ae96de6f7911ba28713f9
+refs/heads/master: efc0fc1c2f37c8c0e43c7616394a979a042b9331
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index b4f3aefa12b6..1607536ff5fb 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -1028,6 +1028,7 @@ endif
 
 config BLK_DEV_HD_ONLY
 	bool "Old hard disk (MFM/RLL/IDE) driver"
+	depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
 	help
 	  There are two drivers for MFM/RLL/IDE hard disks. Most people use
 	  the newer enhanced driver, but this old one is still around for two