diff options
| author | Elliott Hughes <enh@google.com> | 2014-03-11 00:52:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 00:52:51 +0000 |
| commit | a225ca1f2b910fc1236a0397cc4ce6da4dc750e4 (patch) | |
| tree | fc8d60c7bd1c34fba92290a44b6a522458858c40 | |
| parent | 590b308cef906986a67c564a6c08966abd81ff11 (diff) | |
| parent | b96f1083b8d10f3e33b64f0da943dedfdb25b557 (diff) | |
| download | hardware_libhardware-a225ca1f2b910fc1236a0397cc4ce6da4dc750e4.zip hardware_libhardware-a225ca1f2b910fc1236a0397cc4ce6da4dc750e4.tar.gz hardware_libhardware-a225ca1f2b910fc1236a0397cc4ce6da4dc750e4.tar.bz2 | |
am b96f1083: Merge "Move libhardware of <asm/page.h>."
* commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557':
Move libhardware of <asm/page.h>.
| -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> |