diff --git a/[refs] b/[refs]
index d699d569d2b8..67924a5a7873 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 158f30c8945fea7cf0d0161cd9463cf2f3d2c19e
+refs/heads/master: bf2d401bca3681f5380f711be65f2026255cc166
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
index 3f4aa0c99ee4..03f6338acc8f 100644
--- a/trunk/drivers/ata/Kconfig
+++ b/trunk/drivers/ata/Kconfig
@@ -6,6 +6,7 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 
 config ATA
 	tristate "ATA device support"
+	depends on BLOCK
 	depends on !(M32R || M68K) || BROKEN
 	depends on !SUN4 || BROKEN
 	select SCSI