diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-28 12:10:44 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-28 12:10:44 +0200 |
| commit | 7f269bec7ed49385de394fdbd970f463ef2060f0 (patch) | |
| tree | 8c45f8c2e11cf101350272f81892cf4cf7678c3a /linux-core/Makefile | |
| parent | 55a9941977953d16b36bbf3e1dcad392ac70e1ef (diff) | |
| parent | 7f8e4060859651993921281445ec00940c577222 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_compat.c
linux-core/drm_fops.c
linux-core/drm_lock.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/Makefile')
| -rw-r--r-- | linux-core/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile index 2f33e5df..4ac083fe 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -340,6 +340,11 @@ ifneq (,$(findstring i915,$(DRM_MODULES))) CONFIG_DRM_I915 := m endif +GIT_REVISION := $(shell cd "$(DRMSRCDIR)" && git-describe --abbrev=17) +ifneq ($(GIT_REVISION),) +EXTRA_CFLAGS+=-D"GIT_REVISION=\"$(GIT_REVISION)\"" +endif + include $(DRMSRCDIR)/Makefile.kernel # Depencencies |