diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /arch/arm/mach-s3c2410/mach-smdk2440.c | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-smdk2440.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-smdk2440.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c index 7857176d9bcb..357522106f68 100644 --- a/arch/arm/mach-s3c2410/mach-smdk2440.c +++ b/arch/arm/mach-s3c2410/mach-smdk2440.c | |||
| @@ -124,9 +124,11 @@ void __init smdk2440_machine_init(void) | |||
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | MACHINE_START(S3C2440, "SMDK2440") | 126 | MACHINE_START(S3C2440, "SMDK2440") |
| 127 | MAINTAINER("Ben Dooks <ben@fluff.org>") | 127 | /* Maintainer: Ben Dooks <ben@fluff.org> */ |
| 128 | BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) | 128 | .phys_ram = S3C2410_SDRAM_PA, |
| 129 | BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) | 129 | .phys_io = S3C2410_PA_UART, |
| 130 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
| 131 | .boot_params = S3C2410_SDRAM_PA + 0x100, | ||
| 130 | 132 | ||
| 131 | .init_irq = s3c24xx_init_irq, | 133 | .init_irq = s3c24xx_init_irq, |
| 132 | .map_io = smdk2440_map_io, | 134 | .map_io = smdk2440_map_io, |