From b4dd19605662f73f7e5fb182479034b48e9dbd1f Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 30 May 2013 12:33:30 +0800
Subject: [PATCH] fix compiling issues for kernel 3.9

---
 Android.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4fee250..12e586a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,10 +11,12 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 KERNEL_DIR ?= kernel
-CONNECTOR_H := $(wildcard $(KERNEL_DIR)/include/uapi/linux/connector.h)
+
+use_uapi = $(firstword $(wildcard $(addprefix $(KERNEL_DIR)/include/,uapi/$(1) $(1))))
+
 LOCAL_CFLAGS += \
-	-include $(KERNEL_DIR)/include/video/uvesafb.h \
-	-include $(if $(CONNECTOR_H),$(CONNECTOR_H),$(KERNEL_DIR)/include/linux/connector.h)
+	-include $(call use_uapi,video/uvesafb.h) \
+	-include $(call use_uapi,linux/connector.h)
 
 LOCAL_SRC_FILES :=		\
 	v86.c			\
-- 
2.11.0