diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-01-28 12:20:34 -0500 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 12:20:34 -0500 |
| commit | f3dab3989b4282e448cba0f0708934276dcb413a (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-footbridge/ebsa285.c | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
Diffstat (limited to 'arch/arm/mach-footbridge/ebsa285.c')
| -rw-r--r-- | arch/arm/mach-footbridge/ebsa285.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c index b09551ef89ca..b08243500e2e 100644 --- a/arch/arm/mach-footbridge/ebsa285.c +++ b/arch/arm/mach-footbridge/ebsa285.c | |||
| @@ -101,7 +101,7 @@ MACHINE_START(EBSA285, "EBSA285") | |||
| 101 | .video_end = 0x000bffff, | 101 | .video_end = 0x000bffff, |
| 102 | .map_io = footbridge_map_io, | 102 | .map_io = footbridge_map_io, |
| 103 | .init_irq = footbridge_init_irq, | 103 | .init_irq = footbridge_init_irq, |
| 104 | .timer = &footbridge_timer, | 104 | .init_time = footbridge_timer_init, |
| 105 | .restart = footbridge_restart, | 105 | .restart = footbridge_restart, |
| 106 | MACHINE_END | 106 | MACHINE_END |
| 107 | 107 | ||