diff options
| author | Deepak Saxena <dsaxena@plexity.net> | 2005-09-28 21:07:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:59:33 -0400 |
| commit | b38708fca9cc60d8a073a67c3b366116e38011c5 (patch) | |
| tree | 3a49164d3120840a8d5a673ef90f9185f0fc000a /arch | |
| parent | eb693d2994eb762b2201aead31066265ab0be20b (diff) | |
[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')
| -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) | |||
| 123 | platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); | 123 | platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | #ifdef CONFIG_ARCH_IXDP465 | 126 | #ifdef CONFIG_ARCH_IXDP425 |
| 127 | MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") | 127 | MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") |
| 128 | /* Maintainer: MontaVista Software, Inc. */ | 128 | /* Maintainer: MontaVista Software, Inc. */ |
| 129 | .phys_ram = PHYS_OFFSET, | 129 | .phys_ram = PHYS_OFFSET, |