| commit | 232fcee51c9b57b9278eac68d2d8f617487b7e81 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 05 17:51:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 05 17:51:27 2010 -0700 |
| tree | 4cbc4442adad9949c79ed2e04c8f0a1e0a823b87 | |
| parent | 6c36cd5c9ecad2338510d0efa1cd674fc4b82445 [diff] | |
| parent | cc42a2d6f45ca74d64994908e8483c446b734036 [diff] |
am cc42a2d6: am 44bce0fb: merge from open-source master
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