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-bast.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-bast.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 549bcb1f32c0..ccb6bcefa46c 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
| @@ -407,10 +407,11 @@ void __init bast_map_io(void) | |||
| 407 | 407 | ||
| 408 | 408 | ||
| 409 | MACHINE_START(BAST, "Simtec-BAST") | 409 | MACHINE_START(BAST, "Simtec-BAST") |
| 410 | MAINTAINER("Ben Dooks <ben@simtec.co.uk>") | 410 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ |
| 411 | BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) | 411 | .phys_ram = S3C2410_SDRAM_PA, |
| 412 | BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) | 412 | .phys_io = S3C2410_PA_UART, |
| 413 | 413 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | |
| 414 | .boot_params = S3C2410_SDRAM_PA + 0x100, | ||
| 414 | .map_io = bast_map_io, | 415 | .map_io = bast_map_io, |
| 415 | .init_irq = s3c24xx_init_irq, | 416 | .init_irq = s3c24xx_init_irq, |
| 416 | .timer = &s3c24xx_timer, | 417 | .timer = &s3c24xx_timer, |