diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-04-24 20:08:28 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-04-24 20:08:28 +0000 |
| commit | 95167e01773dcfe8e5c1b356cfa1ea4b3a55441b (patch) | |
| tree | 8b5312c5f1d1ecc8231bf8e14a1eb1678474bf8a /firmware/timer.c | |
| parent | 46b492861152af9b91d3ab65ef0e5e14c876c3fc (diff) | |
| download | rockbox-95167e01773dcfe8e5c1b356cfa1ea4b3a55441b.tar.gz rockbox-95167e01773dcfe8e5c1b356cfa1ea4b3a55441b.zip | |
Commit whole Creative Zen Vision:M target tree + all related firmware/
changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17241 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/timer.c')
| -rw-r--r-- | firmware/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/timer.c b/firmware/timer.c index 3d522efd41..bd9050f872 100644 --- a/firmware/timer.c +++ b/firmware/timer.c | |||
| @@ -316,7 +316,7 @@ void timer_unregister(void) | |||
| 316 | #elif CONFIG_CPU == PNX0101 | 316 | #elif CONFIG_CPU == PNX0101 |
| 317 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ | 317 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ |
| 318 | irq_disable_int(IRQ_TIMER1); | 318 | irq_disable_int(IRQ_TIMER1); |
| 319 | #elif CONFIG_CPU == S3C2440 | 319 | #elif CONFIG_CPU == S3C2440 || CONFIG_CPU == DM320 |
| 320 | __TIMER_UNREGISTER(); | 320 | __TIMER_UNREGISTER(); |
| 321 | #endif | 321 | #endif |
| 322 | pfn_timer = NULL; | 322 | pfn_timer = NULL; |