From 6d28017de582090341570d6ad8ceb6ab93238493 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 27 Nov 2007 21:35:56 +0100
Subject: [PATCH] --- yaml --- r: 74271 b: refs/heads/master c:
 9130201003cf3a9f3afe830fe8e544018beab61b h: refs/heads/master i:   74269:
 c973b36cbaeda47d6d1ecb30157739e81c664705   74267:
 f9ffc68c4b0ce154fb4cbb44d442a2fb87074a5b   74263:
 8748abbef6fe1319fe462acac73c5238020f07bf   74255:
 8cff03443dcfece40c5194de30c0f5056b8f55bc   74239:
 137e827968f93f649032c7545fd654fddbb7ccba v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/ide/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b34f4a59a52..73541ae7a048 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aca38a5157dec0090ad800d52c138fb83674481f
+refs/heads/master: 9130201003cf3a9f3afe830fe8e544018beab61b
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index 403e3ffca4e0..45b22282f149 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -483,6 +483,7 @@ config WDC_ALI15X3
 
 config BLK_DEV_AMD74XX
 	tristate "AMD and nVidia IDE support"
+	depends on !ARM
 	select BLK_DEV_IDEDMA_PCI
 	help
 	  This driver adds explicit support for AMD-7xx and AMD-8111 chips