commit 1577e629866b2700e31c9467478e05ebffcc69a1
author Chia-chi Yeh <chiachi@android.com> Mon Aug 30 22:06:39 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 30 22:06:39 2010 -0700
tree 858f0aac35fe64f583e8b128a1bb354c8c0e0adf
parent a9c43aaa4482819ca14bb5f036b328dd4e5f2211
parent 12006013cc2cd0a076855ed068f5f782b24631c3

am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.

Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp

* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
  fixedfft: Only includes cpu-features.h when __arm__ is defined.

media/libmedia/fixedfft.cpp

diff --git a/media/libmedia/fixedfft.cpp b/media/libmedia/fixedfft.cpp
index 9cf05ba..2b495e6 100644
--- a/media/libmedia/fixedfft.cpp
+++ b/media/libmedia/fixedfft.cpp
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#ifdef __ARM_ARCH__
+#ifdef __arm__
 #include <machine/cpu-features.h>
 #endif