From: Dave Airlie <airlied@linux.ie>
Date: Sun, 5 Nov 2006 21:03:18 +0000 (+1100)
Subject: Merge branch 'master' into nouveau-1
X-Git-Tag: libdrm-2.3.1~456^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e90b7ee8cefff59b70e285557aa7920dea77e81;p=platform%2Fupstream%2Flibdrm.git

Merge branch 'master' into nouveau-1

Conflicts:

	linux-core/Makefile.kernel
---

1e90b7ee8cefff59b70e285557aa7920dea77e81
diff --cc linux-core/Makefile.kernel
index 71605de,fba57dd..4b7c90b
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@@ -18,8 -19,8 +19,9 @@@ r128-objs   := r128_drv.o r128_cce.o r1
  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
  i830-objs   := i830_drv.o i830_dma.o i830_irq.o
- i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
+ i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \
 -	i915_buffer.o
++		i915_buffer.o
 +nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o nouveau_object.o nouveau_irq.o
  radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
  sis-objs    := sis_drv.o sis_mm.o
  ffb-objs    := ffb_drv.o ffb_context.o