diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 16:03:52 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 16:03:52 -0700 |
| commit | 44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3 (patch) | |
| tree | 1976fa4d38b37748fc5bb2489784b20570375948 /libpixelflinger | |
| parent | e57d89186def9dfabe39cec7a91397079514dc2a (diff) | |
| parent | 2bef93cc20155c3a59cdbb22c564c4b385b2c160 (diff) | |
| download | core-44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3.tar.gz core-44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3.tar.bz2 core-44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3.zip | |
merge from open-source master
Change-Id: Ic4cfffc3c8d465224b062cef7bcfe5827441057c
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/codeflinger/texturing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpixelflinger/codeflinger/texturing.cpp b/libpixelflinger/codeflinger/texturing.cpp index 6baa28ed9..7f6f8da4e 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 |