summaryrefslogtreecommitdiff
path: root/linux-core/Makefile
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2008-08-13 10:08:02 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-08-13 10:08:02 -0700
commit2f03ba4aad1718a36168550b6a146b79540252e6 (patch)
tree7bc55a8948f00c60ad2354171dd345e35e6ff741 /linux-core/Makefile
parent085df6491e4975681a6e17ff9a67d01268aa7553 (diff)
parentb0e68829462aad00ce68be998da6313bca754e9a (diff)
Merge branch 'master' into modesetting-gem
Conflicts: libdrm/Makefile.am libdrm/xf86drm.h shared-core/i915_dma.c shared-core/i915_irq.c
Diffstat (limited to 'linux-core/Makefile')
-rw-r--r--linux-core/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile
index 1790bdb0..aa212cf9 100644
--- 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),)