From b8d78c19eb32cbace2fd05debc584760ee55fd30 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 30 Jan 2013 16:32:12 +0100
Subject: [PATCH] --- yaml --- r: 356120 b: refs/heads/master c:
 0383a68cd2583ef3693cbfffe5abfc4369d70d46 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/ata/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 07aa3f2581aa..b874cb1c4338 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e5635d10d8112e61776b9513491329f7b0859ce
+refs/heads/master: 0383a68cd2583ef3693cbfffe5abfc4369d70d46
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
index e08d322d01d7..14c3ac9eea96 100644
--- a/trunk/drivers/ata/Kconfig
+++ b/trunk/drivers/ata/Kconfig
@@ -14,7 +14,7 @@ menuconfig ATA
 	tristate "Serial ATA and Parallel ATA drivers"
 	depends on HAS_IOMEM
 	depends on BLOCK
-	depends on !(M32R || M68K) || BROKEN
+	depends on !(M32R || M68K || S390) || BROKEN
 	select SCSI
 	---help---
 	  If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or