Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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

diff --cc drivers/gpu/drm/Makefile
index 470ef6779db33d11e2bcbc60610f8671c34d10ef,bc14ba7c3b6fcd183fb6b535647620f6b7239fe4..39c5aa75b8f119eb6cc3263e44bc592ef25b9f30
--- 1/drivers/gpu/drm/Makefile
--- 2/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 54e174d28234600c49f8845f94c6fcfb7162aa03,89f725fe064def1fb646daf09b74f3d46145b03d..093f57af32d3d9614973372af2e6abce81268706
--- 1/drivers/staging/Kconfig
--- 2/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 cfa6af43c9ea49b0d9e00768f1b0a2027b9dd699,1e83f85be819c38e6261dbfcadb6c5809c60e489..bd3a1c2fbdb40f342d026c766d90eaecc891fa23
--- 1/include/drm/Kbuild
--- 2/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