aboutsummaryrefslogtreecommitdiff
path: root/plugins/dfsound/arm_utils.S
diff options
context:
space:
mode:
authortwinaphex2012-12-02 18:06:01 +0100
committertwinaphex2012-12-02 18:06:01 +0100
commit1cb2b455712a0c9ae814b441a5a46e24e32a808c (patch)
treea355bc7e46c9577f358281259e32024100ac6d6a /plugins/dfsound/arm_utils.S
parent01f0020f8c4d96ce7ff425c0cab66ad93bf2159c (diff)
parenta1a232ad65a5c15314cbfe753f734a0a3ad6cef5 (diff)
downloadpcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.gz
pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.bz2
pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.zip
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins/dfsound/arm_utils.S')
-rw-r--r--plugins/dfsound/arm_utils.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index 22e5844..f4ef243 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -8,6 +8,7 @@
* See the COPYING file in the top-level directory.
*/
+#include "arm_features.h"
.text
.align 2
@@ -100,7 +101,7 @@ mcr_finish:
vstmiage r3!, {d8}
bx lr
-#else
+#elif defined(HAVE_ARMV5)
.global mix_chan @ (int start, int count, int lv, int rv)
mix_chan: