diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-25 00:14:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-25 00:14:42 +0000 |
| commit | 631785fbcb9c6790f62f31fa068117db64c5d93f (patch) | |
| tree | 27bc8ba83d757bc206832178ae1dd4b29f4aee4a /modules | |
| parent | e920fe632cd5070062789174ddbc53010bb65fef (diff) | |
| parent | abd0a90bc02b2f574ea62a457d3302b1ce7cf7c8 (diff) | |
| download | hardware_libhardware-631785fbcb9c6790f62f31fa068117db64c5d93f.zip hardware_libhardware-631785fbcb9c6790f62f31fa068117db64c5d93f.tar.gz hardware_libhardware-631785fbcb9c6790f62f31fa068117db64c5d93f.tar.bz2 | |
am abd0a90b: am b96f1083: Merge "Move libhardware of <asm/page.h>."
* commit 'abd0a90bc02b2f574ea62a457d3302b1ce7cf7c8':
Move libhardware of <asm/page.h>.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gralloc/gr.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/modules/gralloc/gr.h b/modules/gralloc/gr.h index 3a43aa7..732b6bc 100644 --- a/modules/gralloc/gr.h +++ b/modules/gralloc/gr.h @@ -18,11 +18,7 @@ #define GR_H_ #include <stdint.h> -#ifdef HAVE_ANDROID_OS // just want PAGE_SIZE define -# include <asm/page.h> -#else -# include <sys/user.h> -#endif +#include <sys/user.h> #include <limits.h> #include <sys/cdefs.h> #include <hardware/gralloc.h> |