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-bast.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-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, |