Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b38708fc authored by Deepak Saxena's avatar Deepak Saxena Committed by Linus Torvalds
Browse files

[PATCH] Fix thinko in previous ARM 2917/1 patch 



Previous patch accidently add IXDP425 mach entry when IXDP465 is configured.

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent eb693d29

arch/arm/mach-ixp4xx/ixdp425-setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ static void __init ixdp425_init(void) 
	platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices));

	platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices));

}

}





#ifdef CONFIG_ARCH_IXDP465

#ifdef CONFIG_ARCH_IXDP425

MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")

MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")

	/* Maintainer: MontaVista Software, Inc. */

	/* Maintainer: MontaVista Software, Inc. */

	.phys_ram	= PHYS_OFFSET,

	.phys_ram	= PHYS_OFFSET,