diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:26 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:32 -0400 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /arch/arm/mach-ep93xx/simone.c | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (diff) | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (diff) | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/arm/mach-ep93xx/simone.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index f40c2987e545..33dc07917417 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
| @@ -86,5 +86,6 @@ MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") | |||
| 86 | .handle_irq = vic_handle_irq, | 86 | .handle_irq = vic_handle_irq, |
| 87 | .timer = &ep93xx_timer, | 87 | .timer = &ep93xx_timer, |
| 88 | .init_machine = simone_init_machine, | 88 | .init_machine = simone_init_machine, |
| 89 | .init_late = ep93xx_init_late, | ||
| 89 | .restart = ep93xx_restart, | 90 | .restart = ep93xx_restart, |
| 90 | MACHINE_END | 91 | MACHINE_END |