commit 6865ddb29fc7e7a14104d73c65b71074502bb6c7
author Chia-chi Yeh <chiachi@android.com> Tue Aug 31 10:10:20 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 31 10:10:20 2010 -0700
tree 01097ef8ec82e9cc7fb409d33232b0d9bda568e9
parent d0e5b406dd0f86b01b3f550fbb894a7492454da2
parent eebcf36cf2db2563af8ef479e01747321aa959e8

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

Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1'

* commit '1577e629866b2700e31c9467478e05ebffcc69a1':
  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