commit abd0a90bc02b2f574ea62a457d3302b1ce7cf7c8
author Elliott Hughes <enh@google.com> Tue Feb 25 00:06:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 25 00:06:51 2014 +0000
tree 5682e9c55d4ff93c4e939021f5df7aba529a0bef
parent 055c209a15788ead2043e9fe162169df460d3a53
parent b96f1083b8d10f3e33b64f0da943dedfdb25b557

am b96f1083: Merge "Move libhardware of <asm/page.h>."

* commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557':
  Move libhardware of <asm/page.h>.

modules/gralloc/gr.h

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>