From ce016ca206b225a332948e3c4c926581e5d3e122 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 20 Jun 2005 13:57:17 -0700 Subject: [PATCH] Manual merge to avoid conflicts --- arch/arm/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.41.1