diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 10:51:07 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 10:51:07 +0100 |
| commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
| tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /arch/arm/mach-s5pv210/mach-torbreck.c | |
| parent | Input: elantech - add resolution query support for v4 hardware (diff) | |
| parent | Linux 3.2-rc3 (diff) | |
| download | linux-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.tar.xz linux-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.zip | |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-torbreck.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-torbreck.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c index 925fc0dc6252..97cc066c5369 100644 --- a/arch/arm/mach-s5pv210/mach-torbreck.c +++ b/arch/arm/mach-s5pv210/mach-torbreck.c @@ -125,7 +125,7 @@ static void __init torbreck_machine_init(void) MACHINE_START(TORBRECK, "TORBRECK") /* Maintainer: Hyunchul Ko <ghcstop@gmail.com> */ - .boot_params = S5P_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = s5pv210_init_irq, .map_io = torbreck_map_io, .init_machine = torbreck_machine_init, |