diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-s5pv210/mach-aquila.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-aquila.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-aquila.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 509627f25111..5811a96125f0 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c | |||
| @@ -678,7 +678,7 @@ MACHINE_START(AQUILA, "Aquila") | |||
| 678 | /* Maintainers: | 678 | /* Maintainers: |
| 679 | Marek Szyprowski <m.szyprowski@samsung.com> | 679 | Marek Szyprowski <m.szyprowski@samsung.com> |
| 680 | Kyungmin Park <kyungmin.park@samsung.com> */ | 680 | Kyungmin Park <kyungmin.park@samsung.com> */ |
| 681 | .boot_params = S5P_PA_SDRAM + 0x100, | 681 | .atag_offset = 0x100, |
| 682 | .init_irq = s5pv210_init_irq, | 682 | .init_irq = s5pv210_init_irq, |
| 683 | .map_io = aquila_map_io, | 683 | .map_io = aquila_map_io, |
| 684 | .init_machine = aquila_machine_init, | 684 | .init_machine = aquila_machine_init, |