From: Deepak Saxena Date: Thu, 29 Sep 2005 01:07:01 +0000 (-0700) Subject: [PATCH] Fix thinko in previous ARM 2917/1 patch X-Git-Tag: v2.6.14-rc3~52 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b38708fca9cc60d8a073a67c3b366116e38011c5;p=linux-2.6-omap-h63xx.git [PATCH] Fix thinko in previous ARM 2917/1 patch Previous patch accidently add IXDP425 mach entry when IXDP465 is configured. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds --- diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 39b06ed8064..0a41080d226 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c @@ -123,7 +123,7 @@ static void __init ixdp425_init(void) platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); } -#ifdef CONFIG_ARCH_IXDP465 +#ifdef CONFIG_ARCH_IXDP425 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") /* Maintainer: MontaVista Software, Inc. */ .phys_ram = PHYS_OFFSET,