From: Tony Lindgren <tony@atomide.com>
Date: Mon, 20 Jun 2005 20:57:17 +0000 (-0700)
Subject: Manual merge to avoid conflicts
X-Git-Tag: v2.6.13-omap1~114
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ce016ca206b225a332948e3c4c926581e5d3e122;p=linux-2.6-omap-h63xx.git

Manual merge to avoid conflicts
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8b8750cf55d..1f75f2fdf52 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -687,9 +687,9 @@ source "drivers/block/Kconfig"
 
 source "drivers/acorn/block/Kconfig"
 
-if ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_L7200 \
-		|| ARCH_LH7A40X || ARCH_PXA || ARCH_RPC || ARCH_S3C2410 \
-		|| ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE || PCMCIA
+if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \
+	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
+	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE
 source "drivers/ide/Kconfig"
 endif