diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /arch/arm/mach-s3c2410/mach-nexcoder.c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-nexcoder.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-nexcoder.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-nexcoder.c b/arch/arm/mach-s3c2410/mach-nexcoder.c index 70487bf4b71e..d24c242414ca 100644 --- a/arch/arm/mach-s3c2410/mach-nexcoder.c +++ b/arch/arm/mach-s3c2410/mach-nexcoder.c | |||
| @@ -147,9 +147,11 @@ void __init nexcoder_map_io(void) | |||
| 147 | 147 | ||
| 148 | 148 | ||
| 149 | MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") | 149 | MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") |
| 150 | MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>") | 150 | /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */ |
| 151 | BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) | 151 | .phys_ram = S3C2410_SDRAM_PA, |
| 152 | BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) | 152 | .phys_io = S3C2410_PA_UART, |
| 153 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
| 154 | .boot_params = S3C2410_SDRAM_PA + 0x100, | ||
| 153 | .map_io = nexcoder_map_io, | 155 | .map_io = nexcoder_map_io, |
| 154 | .init_irq = s3c24xx_init_irq, | 156 | .init_irq = s3c24xx_init_irq, |
| 155 | .timer = &s3c24xx_timer, | 157 | .timer = &s3c24xx_timer, |