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-otom.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-otom.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-otom.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c index 67d8ce8fb00f..d901ed492ff5 100644 --- a/arch/arm/mach-s3c2410/mach-otom.c +++ b/arch/arm/mach-s3c2410/mach-otom.c | |||
| @@ -115,9 +115,11 @@ void __init otom11_map_io(void) | |||
| 115 | 115 | ||
| 116 | 116 | ||
| 117 | MACHINE_START(OTOM, "Nex Vision - Otom 1.1") | 117 | MACHINE_START(OTOM, "Nex Vision - Otom 1.1") |
| 118 | MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>") | 118 | /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */ |
| 119 | BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) | 119 | .phys_ram = S3C2410_SDRAM_PA, |
| 120 | BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) | 120 | .phys_io = S3C2410_PA_UART, |
| 121 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
| 122 | .boot_params = S3C2410_SDRAM_PA + 0x100, | ||
| 121 | .map_io = otom11_map_io, | 123 | .map_io = otom11_map_io, |
| 122 | .init_irq = s3c24xx_init_irq, | 124 | .init_irq = s3c24xx_init_irq, |
| 123 | .timer = &s3c24xx_timer, | 125 | .timer = &s3c24xx_timer, |