From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2009 21:19:31 +0000 (-0800)
Subject: Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.33-rc1~44
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=5fa3577b1a1202972e6e419040438c29f39f59cc;p=cascardo%2Flinux.git

Merge branch 'drm-vmware-staging' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/vmwgfx: Add DRM driver for VMware Virtual GPU
  drm/vmwgfx: Add svga headers for vmwgfx driver
  drm/ttm: Add more driver type enums
---

5fa3577b1a1202972e6e419040438c29f39f59cc
diff --cc drivers/gpu/drm/Makefile
index 470ef6779db3,bc14ba7c3b6f..39c5aa75b8f1
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -30,6 -30,5 +30,7 @@@ obj-$(CONFIG_DRM_I830)	+= i830
  obj-$(CONFIG_DRM_I915)  += i915/
  obj-$(CONFIG_DRM_SIS)   += sis/
  obj-$(CONFIG_DRM_SAVAGE)+= savage/
+ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
  obj-$(CONFIG_DRM_VIA)	+=via/
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
 +obj-y			+= i2c/
diff --cc drivers/staging/Kconfig
index 54e174d28234,89f725fe064d..093f57af32d3
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -99,10 -101,10 +99,12 @@@ source "drivers/staging/p9auth/Kconfig
  
  source "drivers/staging/line6/Kconfig"
  
+ source "drivers/gpu/drm/vmwgfx/Kconfig"
+ 
  source "drivers/gpu/drm/radeon/Kconfig"
  
 +source "drivers/gpu/drm/nouveau/Kconfig"
 +
  source "drivers/staging/octeon/Kconfig"
  
  source "drivers/staging/serqt_usb2/Kconfig"
diff --cc include/drm/Kbuild
index cfa6af43c9ea,1e83f85be819..bd3a1c2fbdb4
--- a/include/drm/Kbuild
+++ b/include/drm/Kbuild
@@@ -7,5 -7,5 +7,6 @@@ unifdef-y += r128_drm.
  unifdef-y += radeon_drm.h
  unifdef-y += sis_drm.h
  unifdef-y += savage_drm.h
+ unifdef-y += vmwgfx_drm.h
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h