diff --git a/[refs] b/[refs]
index 9dfb38ae70b0..7875aa838ddf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9317fd4c60962d3a9423b5f9bb5d1b10cf8a0699
+refs/heads/master: 8abf1064c786ef5435b2d53cc8e9ebee13020de6
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
index 702fcc363bc0..99837d932f36 100644
--- a/trunk/drivers/ata/Kconfig
+++ b/trunk/drivers/ata/Kconfig
@@ -7,6 +7,7 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 config ATA
 	tristate "ATA device support"
 	depends on !(M32R || M68K) || BROKEN
+	depends on !SUN4 || BROKEN
 	select SCSI
 	---help---
 	  If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or