diff options
| author | Tomasz Malesinski <tomal@rockbox.org> | 2007-09-22 23:37:58 +0000 |
|---|---|---|
| committer | Tomasz Malesinski <tomal@rockbox.org> | 2007-09-22 23:37:58 +0000 |
| commit | 4fc77ac3ff8a4105b8e92a7f3d88b65b3bcea1cd (patch) | |
| tree | 26583d60ee44505ac5a031dbd9beb36b5d19b467 /firmware | |
| parent | ed83edfd7bb918927213ebff79bea87c0ffb0408 (diff) | |
| download | rockbox-4fc77ac3ff8a4105b8e92a7f3d88b65b3bcea1cd.tar.gz rockbox-4fc77ac3ff8a4105b8e92a7f3d88b65b3bcea1cd.zip | |
Fix empty commit: Add grayscale support for ARM in vertical packing format.
Enable grayscale for Iriver ifp. Fix timer_unregister for PNX0101.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14825 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -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 c08e8348d9..d15ba64443 100644 --- a/firmware/timer.c +++ b/firmware/timer.c | |||
| @@ -303,7 +303,7 @@ void timer_unregister(void) | |||
| 303 | CPU_INT_CLR = TIMER2_MASK; | 303 | CPU_INT_CLR = TIMER2_MASK; |
| 304 | #elif CONFIG_CPU == PNX0101 | 304 | #elif CONFIG_CPU == PNX0101 |
| 305 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ | 305 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ |
| 306 | irq_disable_int(5); | 306 | irq_disable_int(IRQ_TIMER1); |
| 307 | #elif CONFIG_CPU == S3C2440 | 307 | #elif CONFIG_CPU == S3C2440 |
| 308 | __TIMER_UNREGISTER(); | 308 | __TIMER_UNREGISTER(); |
| 309 | #endif | 309 | #endif |