diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /include/asm-arm/arch-l7200/time.h | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
| download | kernel_samsung_smdk4412-e993835441734c184d70d3716eed78a08eeb71c2.zip kernel_samsung_smdk4412-e993835441734c184d70d3716eed78a08eeb71c2.tar.gz kernel_samsung_smdk4412-e993835441734c184d70d3716eed78a08eeb71c2.tar.bz2 | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-arm/arch-l7200/time.h')
| -rw-r--r-- | include/asm-arm/arch-l7200/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-l7200/time.h b/include/asm-arm/arch-l7200/time.h index 7b98b53..c69cb50 100644 --- a/include/asm-arm/arch-l7200/time.h +++ b/include/asm-arm/arch-l7200/time.h @@ -45,7 +45,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - do_timer(regs); + do_timer(1); #ifndef CONFIG_SMP update_process_times(user_mode(regs)); #endif |