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-spear3xx/spear300_evb.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-spear3xx/spear300_evb.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear300_evb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c index 69006f694220..a5ff98eed1db 100644 --- a/arch/arm/mach-spear3xx/spear300_evb.c +++ b/arch/arm/mach-spear3xx/spear300_evb.c | |||
| @@ -64,7 +64,7 @@ static void __init spear300_evb_init(void) | |||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | MACHINE_START(SPEAR300, "ST-SPEAR300-EVB") | 66 | MACHINE_START(SPEAR300, "ST-SPEAR300-EVB") |
| 67 | .boot_params = 0x00000100, | 67 | .atag_offset = 0x100, |
| 68 | .map_io = spear3xx_map_io, | 68 | .map_io = spear3xx_map_io, |
| 69 | .init_irq = spear3xx_init_irq, | 69 | .init_irq = spear3xx_init_irq, |
| 70 | .timer = &spear3xx_timer, | 70 | .timer = &spear3xx_timer, |