commit cc42a2d6f45ca74d64994908e8483c446b734036
author The Android Open Source Project <initial-contribution@android.com> Wed May 05 16:05:53 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 05 16:05:53 2010 -0700
tree 33fb99dbca32ed8481235ce5e49fced2cd2331fa
parent 3b9255e3f5ff68c03e9c0df9d82a74891bede6d7
parent 44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3

am 44bce0fb: merge from open-source master

Merge commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3' into kraken

* commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3':
  cpu-features.h is only available for ARM

libpixelflinger/codeflinger/texturing.cpp

diff --git a/libpixelflinger/codeflinger/texturing.cpp b/libpixelflinger/codeflinger/texturing.cpp
index 6baa28e..7f6f8da 100644
--- a/libpixelflinger/codeflinger/texturing.cpp
+++ b/libpixelflinger/codeflinger/texturing.cpp
@@ -25,7 +25,7 @@
 
 #include "codeflinger/GGLAssembler.h"
 
-#ifdef __arm__
+#ifdef __ARM_ARCH__
 #include <machine/cpu-features.h>
 #endif