diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-netx/nxdb500.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-netx/nxdb500.c')
| -rw-r--r-- | arch/arm/mach-netx/nxdb500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c index ca8b203a3c99..90903dd44cbc 100644 --- a/arch/arm/mach-netx/nxdb500.c +++ b/arch/arm/mach-netx/nxdb500.c | |||
| @@ -200,7 +200,7 @@ static void __init nxdb500_init(void) | |||
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | MACHINE_START(NXDB500, "Hilscher nxdb500") | 202 | MACHINE_START(NXDB500, "Hilscher nxdb500") |
| 203 | .boot_params = 0x80000100, | 203 | .atag_offset = 0x100, |
| 204 | .map_io = netx_map_io, | 204 | .map_io = netx_map_io, |
| 205 | .init_irq = netx_init_irq, | 205 | .init_irq = netx_init_irq, |
| 206 | .timer = &netx_timer, | 206 | .timer = &netx_timer, |