diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-s3c64xx/mach-mini6410.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-mini6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-mini6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 527f49bd1b57..e91f63f7a490 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c | |||
| @@ -349,7 +349,7 @@ static void __init mini6410_machine_init(void) | |||
| 349 | 349 | ||
| 350 | MACHINE_START(MINI6410, "MINI6410") | 350 | MACHINE_START(MINI6410, "MINI6410") |
| 351 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ | 351 | /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ |
| 352 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 352 | .atag_offset = 0x100, |
| 353 | .init_irq = s3c6410_init_irq, | 353 | .init_irq = s3c6410_init_irq, |
| 354 | .map_io = mini6410_map_io, | 354 | .map_io = mini6410_map_io, |
| 355 | .init_machine = mini6410_machine_init, | 355 | .init_machine = mini6410_machine_init, |