From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 24 Aug 2009 21:31:35 +0000 (+0200)
Subject: Merge commit 'jprvita2/master'
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/57e1f84f03735c1f285a65cb154d8dd7a229a3b6?hp=2772521698caa4ffe7c0c2de174e9d901d7752fd

Merge commit 'jprvita2/master'
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 2fd9a734..561891ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -836,8 +836,9 @@ libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES = \
 		pulsecore/resampler.c pulsecore/resampler.h \
 		pulsecore/rtpoll.c pulsecore/rtpoll.h \
 		pulsecore/sample-util.c pulsecore/sample-util.h \
-		pulsecore/cpu-arm.c pulsecore/cpu-x86.c \
-		pulsecore/svolume_c.c pulsecore/svolume_arm.c\
+		pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
+		pulsecore/cpu-x86.c pulsecore/cpu-x86.h \
+		pulsecore/svolume_c.c pulsecore/svolume_arm.c \
 		pulsecore/svolume_mmx.c pulsecore/svolume_sse.c \
 		pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
 		pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 956fe4c5..b1f24e15 100644
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -50,7 +50,7 @@ PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(TRUE);
 PA_MODULE_USAGE("just-one=<boolean>");
-PA_MODULE_DEPRECATED("Please use module-hal-detect instead of module-detect!");
+PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-detect!");
 
 static const char* const valid_modargs[] = {
     "just-one",
diff --git a/src/pulsecore/remap_mmx.c b/src/pulsecore/remap_mmx.c
index bfcae6c5..00252dac 100644
--- a/src/pulsecore/remap_mmx.c
+++ b/src/pulsecore/remap_mmx.c
@@ -95,6 +95,7 @@
                 "4:                             \n\t"   \
                 " emms                          \n\t"
 
+#if defined (__i386__) || defined (__amd64__)
 static void remap_mono_to_stereo_mmx (pa_remap_t *m, void *dst, const void *src, unsigned n) {
     pa_reg_x86 temp;
 
@@ -138,6 +139,7 @@ static void init_remap_mmx (pa_remap_t *m) {
         pa_log_info("Using MMX mono to stereo remapping");
     }
 }
+#endif /* defined (__i386__) || defined (__amd64__) */
 
 void pa_remap_func_init_mmx (pa_cpu_x86_flag_t flags) {
 #if defined (__i386__) || defined (__amd64__)