diff options
| author | Deepak Saxena | 2005-09-29 03:07:01 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-29 17:59:33 +0200 |
| commit | b38708fca9cc60d8a073a67c3b366116e38011c5 (patch) | |
| tree | 3a49164d3120840a8d5a673ef90f9185f0fc000a /arch/arm/mach-ixp4xx/ixdp425-setup.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | kernel-qcow2-linux-b38708fca9cc60d8a073a67c3b366116e38011c5.tar.gz kernel-qcow2-linux-b38708fca9cc60d8a073a67c3b366116e38011c5.tar.xz kernel-qcow2-linux-b38708fca9cc60d8a073a67c3b366116e38011c5.zip | |
[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>
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 39b06ed80646..0a41080d2266 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, |