Fix more warnings. Don't compile PortalPlayer pcm code in bootloader builds.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11799 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 3 insertions, 1 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 11242a062c..f83abdbc51 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -262,8 +262,10 @@ drivers/i2c-pnx0101.c
 /* no i2c driver yet */
 #endif
 #if defined(CPU_PP)
+#ifndef BOOTLOADER
 target/arm/pcm-pp.c
 target/arm/audio-pp.c
+#endif
 target/arm/crt0-pp.S
 #elif defined(CPU_ARM)
 target/arm/crt0.S
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index d05884e8eb..f6f71d774e 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -25,7 +25,7 @@
 #include "wm8975.h"
 #elif defined(HAVE_WM8758)
 #include "wm8758.h"
-#elif defined(HAVE_WM8731)
+#elif defined(HAVE_WM8731) || defined(HAVE_WM8721)
 #include "wm8731l.h"
 #endif