Manual merge to avoid conflicts

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8b8750cf55d9120b00d8249e8fdbf0ae8105bba3..1f75f2fdf52d60418f309ff0179d906bab652433 100644 (file)
--- 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