From: Dave Airlie <airlied@redhat.com>
Date: Thu, 17 Dec 2009 23:53:50 +0000 (+1000)
Subject: Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
X-Git-Tag: v2.6.33-rc2~19^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbc8cc049aefd571ebc3c255dc3e265f736751c0;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
---

cbc8cc049aefd571ebc3c255dc3e265f736751c0
diff --cc drivers/gpu/drm/Makefile
index 470ef67,bc14ba7..39c5aa7
--- 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 da74e21,89f725f..9533ab6
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -101,10 -101,10 +101,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 cfa6af4,1e83f85..bd3a1c2
--- 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