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-ixp23xx/espresso.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-ixp23xx/espresso.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/espresso.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp23xx/espresso.c b/arch/arm/mach-ixp23xx/espresso.c index e25e5fe183ba..30dd31652e9d 100644 --- a/arch/arm/mach-ixp23xx/espresso.c +++ b/arch/arm/mach-ixp23xx/espresso.c | |||
| @@ -88,6 +88,6 @@ MACHINE_START(ESPRESSO, "IP Fabrics Double Espresso") | |||
| 88 | .map_io = ixp23xx_map_io, | 88 | .map_io = ixp23xx_map_io, |
| 89 | .init_irq = ixp23xx_init_irq, | 89 | .init_irq = ixp23xx_init_irq, |
| 90 | .timer = &ixp23xx_timer, | 90 | .timer = &ixp23xx_timer, |
| 91 | .boot_params = 0x00000100, | 91 | .atag_offset = 0x100, |
| 92 | .init_machine = espresso_init, | 92 | .init_machine = espresso_init, |
| 93 | MACHINE_END | 93 | MACHINE_END |