commit 0ae6d2e8261be77c739527142c59a9d895b02fe1
author Eric Laurent <elaurent@google.com> Wed Aug 25 10:41:55 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 25 10:41:55 2010 -0700
tree 80d10bccb0eece5f06900219c3f23f0abcd83957
parent aed922ffffcf872c5d37ed349c4da961eb84f841
parent 74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64

am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'

* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
  Fix the simulator build.

media/libmedia/fixedfft.cpp

diff --git a/media/libmedia/fixedfft.cpp b/media/libmedia/fixedfft.cpp
index 28eb05a..9cf05ba 100644
--- a/media/libmedia/fixedfft.cpp
+++ b/media/libmedia/fixedfft.cpp
@@ -26,7 +26,9 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#ifdef __ARM_ARCH__
 #include <machine/cpu-features.h>
+#endif
 
 #define LOG_FFT_SIZE 10
 #define MAX_FFT_SIZE (1 << LOG_FFT_SIZE)