From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 26 Jul 2007 23:58:28 +0000 (-0700)
Subject: Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
X-Git-Tag: submit/1.0/20121108.012404~1030^2~119^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c561cb4650dc5895acfb3ae00c7ff455be31a860;hp=-c;p=profile%2Fivi%2Flibdrm.git

Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2

Conflicts:

	linux-core/drmP.h
	linux-core/drm_scatter.c
---

c561cb4650dc5895acfb3ae00c7ff455be31a860
diff --combined linux-core/Makefile.kernel
index 321eb80,5aa589c..c898206
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@@ -22,6 -22,7 +22,7 @@@ i915-objs   := i915_drv.o i915_dma.o i9
  		i915_buffer.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_sgdma.o \
  		nv04_timer.o \
  		nv04_mc.o nv40_mc.o nv50_mc.o \
  		nv04_fb.o nv10_fb.o nv40_fb.o \
@@@ -37,7 -38,6 +38,7 @@@ via-objs    := via_irq.o via_drv.o via_
  		via_video.o via_dmablit.o via_fence.o via_buffer.o
  mach64-objs := mach64_drv.o mach64_dma.o mach64_irq.o mach64_state.o
  nv-objs := nv_drv.o
 +xgi-objs    := xgi_cmdlist.o xgi_drv.o xgi_fb.o xgi_misc.o xgi_pcie.o
  
  ifeq ($(CONFIG_COMPAT),y)
  drm-objs    += drm_ioc32.o
@@@ -62,4 -62,3 +63,4 @@@ obj-$(CONFIG_DRM_VIA)   += via.
  obj-$(CONFIG_DRM_MACH64)+= mach64.o
  obj-$(CONFIG_DRM_NV)    += nv.o
  obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o
 +obj-$(CONFIG_DRM_XGI)   += xgi.o