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-s3c2412/mach-smdk2413.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-s3c2412/mach-smdk2413.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-smdk2413.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index 834cfb61bcf..d6325ede9f2 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
| @@ -128,7 +128,7 @@ static void __init smdk2413_machine_init(void) | |||
| 128 | 128 | ||
| 129 | MACHINE_START(S3C2413, "S3C2413") | 129 | MACHINE_START(S3C2413, "S3C2413") |
| 130 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 130 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
| 131 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 131 | .atag_offset = 0x100, |
| 132 | 132 | ||
| 133 | .fixup = smdk2413_fixup, | 133 | .fixup = smdk2413_fixup, |
| 134 | .init_irq = s3c24xx_init_irq, | 134 | .init_irq = s3c24xx_init_irq, |
| @@ -139,7 +139,7 @@ MACHINE_END | |||
| 139 | 139 | ||
| 140 | MACHINE_START(SMDK2412, "SMDK2412") | 140 | MACHINE_START(SMDK2412, "SMDK2412") |
| 141 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 141 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
| 142 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 142 | .atag_offset = 0x100, |
| 143 | 143 | ||
| 144 | .fixup = smdk2413_fixup, | 144 | .fixup = smdk2413_fixup, |
| 145 | .init_irq = s3c24xx_init_irq, | 145 | .init_irq = s3c24xx_init_irq, |
| @@ -150,7 +150,7 @@ MACHINE_END | |||
| 150 | 150 | ||
| 151 | MACHINE_START(SMDK2413, "SMDK2413") | 151 | MACHINE_START(SMDK2413, "SMDK2413") |
| 152 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 152 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
| 153 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 153 | .atag_offset = 0x100, |
| 154 | 154 | ||
| 155 | .fixup = smdk2413_fixup, | 155 | .fixup = smdk2413_fixup, |
| 156 | .init_irq = s3c24xx_init_irq, | 156 | .init_irq = s3c24xx_init_irq, |