diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 17:39:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 17:39:33 -0400 |
| commit | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (patch) | |
| tree | de5a3cb87a4731d8b8c075c6de4800fe52f5bc70 /arch/arm/mach-s3c2410/mach-n30.c | |
| parent | 08ab8c20316d6189a16b8101544a3e32b4c75e49 (diff) | |
| parent | 0d670b413f042eccdffc45bafb9840244752707f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-n30.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index bd15998c129b..79044d9bce38 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
| @@ -137,10 +137,11 @@ void __init n30_init(void) | |||
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | MACHINE_START(N30, "Acer-N30") | 139 | MACHINE_START(N30, "Acer-N30") |
| 140 | MAINTAINER("Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org>") | 140 | /* Maintainer: Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org> */ |
| 141 | BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) | 141 | .phys_ram = S3C2410_SDRAM_PA, |
| 142 | BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) | 142 | .phys_io = S3C2410_PA_UART, |
| 143 | 143 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | |
| 144 | .boot_params = S3C2410_SDRAM_PA + 0x100, | ||
| 144 | .timer = &s3c24xx_timer, | 145 | .timer = &s3c24xx_timer, |
| 145 | .init_machine = n30_init, | 146 | .init_machine = n30_init, |
| 146 | .init_irq = n30_init_irq, | 147 | .init_irq = n30_init_irq, |