Merge branch 'master' into modesetting-gem

[platform/upstream/libdrm.git] / linux-core / Makefile

diff --git a/linux-core/Makefile b/linux-core/Makefile
index 1790bdb..aa212cf 100644 (file)
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -271,6 +271,10 @@ ifneq ($(PAGE_AGP),0)
 EXTRA_CFLAGS += -DHAVE_PAGE_AGP
 endif
 
+ifeq ($(OS_HAS_GEM), 1)
+EXTRA_CFLAGS += -DOS_HAS_GEM=1
+endif
+
 # Start with all modules turned off.
 CONFIG_DRM_GAMMA := n
 CONFIG_DRM_TDFX := n
@@ -337,8 +341,10 @@ ifneq (,$(findstring i810,$(DRM_MODULES)))
 CONFIG_DRM_I810 := m
 endif
 ifneq (,$(findstring i915,$(DRM_MODULES)))
+ifeq ($(OS_HAS_GEM), 1)
 CONFIG_DRM_I915 := m
 endif
+endif
 
 GIT_REVISION := $(shell cd "$(DRMSRCDIR)" && git-describe --abbrev=17)
 ifneq ($(GIT_REVISION),)