diff options
| author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
|---|---|---|
| committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
| commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
| tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /firmware/pcm_playback.c | |
| parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
| download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip | |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/pcm_playback.c')
| -rw-r--r-- | firmware/pcm_playback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index e6e59ca604..1b16eb47db 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c | |||
| @@ -50,7 +50,7 @@ void pcm_play_pause_unpause(void); | |||
| 50 | 50 | ||
| 51 | /** Functions that require targeted implementation **/ | 51 | /** Functions that require targeted implementation **/ |
| 52 | 52 | ||
| 53 | #if defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) | 53 | #if defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) || (CONFIG_CPU == IMX31L) |
| 54 | /* Implemented in target/... */ | 54 | /* Implemented in target/... */ |
| 55 | #else | 55 | #else |
| 56 | /* dummy functions for those not actually supporting all this yet */ | 56 | /* dummy functions for those not actually supporting all this yet */ |