Merge "Lose HAVE_ANDROID_OS from hardware/samsung_slsi/exynos5."

diff --git a/gralloc/framebuffer.cpp b/gralloc/framebuffer.cpp
index 82a36bccccd573afc2d0e92e8d281c2f03ab7ddb..86db0302e5555b9c28112ffeda8e8496f8240e04 100644 (file)
--- a/gralloc/framebuffer.cpp
+++ b/gralloc/framebuffer.cpp
@@ -35,7 +35,7 @@
 #include <cutils/log.h>
 #include <cutils/atomic.h>
 
-#if HAVE_ANDROID_OS
+#ifdef __ANDROID__
 #include <linux/fb.h>
 #endif