diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/mach-s3c2410/mach-smdk2410.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-smdk2410.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-smdk2410.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c index c1a4a1420ea0..67e903a700d3 100644 --- a/arch/arm/mach-s3c2410/mach-smdk2410.c +++ b/arch/arm/mach-s3c2410/mach-smdk2410.c | |||
| @@ -112,11 +112,13 @@ void __init smdk2410_init_irq(void) | |||
| 112 | 112 | ||
| 113 | MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch | 113 | MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch |
| 114 | * to SMDK2410 */ | 114 | * to SMDK2410 */ |
| 115 | MAINTAINER("Jonas Dietsche") | 115 | /* Maintainer: Jonas Dietsche */ |
| 116 | BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) | 116 | .phys_ram = S3C2410_SDRAM_PA, |
| 117 | BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) | 117 | .phys_io = S3C2410_PA_UART, |
| 118 | MAPIO(smdk2410_map_io) | 118 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, |
| 119 | INITIRQ(smdk2410_init_irq) | 119 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
| 120 | .map_io = smdk2410_map_io, | ||
| 121 | .init_irq = smdk2410_init_irq, | ||
| 120 | .timer = &s3c24xx_timer, | 122 | .timer = &s3c24xx_timer, |
| 121 | MACHINE_END | 123 | MACHINE_END |
| 122 | 124 | ||