diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
commit | 88bd1e4a350d011ec44f6786e0bfdf8fb386800c (patch) | |
tree | e78d09fe0eb28514aa060de05ba8aee298fd120e /linux-core/Makefile.kernel | |
parent | 2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c (diff) | |
parent | 612c22f131a25915196e69d7ec1adb6f4ec84a60 (diff) |
Merge branch 'intel-post-reloc'
Conflicts:
linux-core/drm_compat.c
linux-core/drm_compat.h
linux-core/drm_ttm.c
shared-core/i915_dma.c
Bump driver minor to 13 due to introduction of new
relocation type.
Diffstat (limited to 'linux-core/Makefile.kernel')
-rw-r--r-- | linux-core/Makefile.kernel | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index e7c280d0..defbe43b 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -20,7 +20,7 @@ r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \ - i915_buffer.o i915_compat.o + i915_buffer.o i915_compat.o i915_execbuf.o nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \ nouveau_sgdma.o nouveau_dma.o nouveau_buffer.o nouveau_fence.o \ |