diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /kernel/time/tick-common.c | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 80c4336f4188..c4777193d567 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c | |||
| @@ -161,6 +161,7 @@ static void tick_setup_device(struct tick_device *td, | |||
| 161 | } else { | 161 | } else { |
| 162 | handler = td->evtdev->event_handler; | 162 | handler = td->evtdev->event_handler; |
| 163 | next_event = td->evtdev->next_event; | 163 | next_event = td->evtdev->next_event; |
| 164 | td->evtdev->event_handler = clockevents_handle_noop; | ||
| 164 | } | 165 | } |
| 165 | 166 | ||
| 166 | td->evtdev = newdev; | 167 | td->evtdev = newdev; |