aboutsummaryrefslogtreecommitdiffstats
path: root/hw/pxa2xx_timer.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-05-08 19:20:04 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-05-08 19:20:04 +0000
commit565d28951e971abf342fcc8701861163b7421f23 (patch)
tree7cefdc9a4916e8f0cdfb9b747ad833ac9a97220b /hw/pxa2xx_timer.c
parentd95b2f8d365a3ef431111e9188d219de1f577a90 (diff)
Set OOK when OON is set in OSCC register (thanks to BobOfDoom). Correct a fatal typo in timer code.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2785 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pxa2xx_timer.c')
-rw-r--r--hw/pxa2xx_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c
index 3ab714932..8c083595c 100644
--- a/hw/pxa2xx_timer.c
+++ b/hw/pxa2xx_timer.c
@@ -364,7 +364,7 @@ static void pxa2xx_timer_tick4(void *opaque)
struct pxa2xx_timer4_s *t = (struct pxa2xx_timer4_s *) opaque;
pxa2xx_timer_info *i = (pxa2xx_timer_info *) t->info;
- pxa2xx_timer_tick4(opaque);
+ pxa2xx_timer_tick(opaque);
if (t->control & (1 << 3))
t->clock = 0;
if (t->control & (1 << 6))