merge from open-source master

Change-Id: Ic4cfffc3c8d465224b062cef7bcfe5827441057c
This commit is contained in:
The Android Open Source Project 2010-05-05 16:03:52 -07:00
commit 44bce0fb57

View file

@ -25,7 +25,7 @@
#include "codeflinger/GGLAssembler.h"
#ifdef __arm__
#ifdef __ARM_ARCH__
#include <machine/cpu-features.h>
#endif