From 590501cfe404b5463adecc70628e5bc7c8f142a2 Mon Sep 17 00:00:00 2001 From: Will Robertson Date: Fri, 21 Sep 2007 15:51:53 +0000 Subject: 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 --- firmware/pcm_playback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'firmware/pcm_playback.c') 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); /** Functions that require targeted implementation **/ -#if defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) +#if defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) || (CONFIG_CPU == IMX31L) /* Implemented in target/... */ #else /* dummy functions for those not actually supporting all this yet */ -- cgit v1.2.3