tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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 <dsaxena@plexity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Deepak Saxena and committed by Linus Torvalds b38708fc eb693d29

+1 -1
unified split
+1 -1
arch/arm/mach-ixp4xx/ixdp425-setup.c
··· 123 platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); 124 } 125 126 - #ifdef CONFIG_ARCH_IXDP465 127 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") 128 /* Maintainer: MontaVista Software, Inc. */ 129 .phys_ram = PHYS_OFFSET,
··· 123 platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); 124 } 125 126 + #ifdef CONFIG_ARCH_IXDP425 127 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") 128 /* Maintainer: MontaVista Software, Inc. */ 129 .phys_ram = PHYS_OFFSET,