From: Dave Airlie <airlied@redhat.com>
Date: Wed, 3 Jun 2015 23:36:39 +0000 (+1000)
Subject: Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63e1456122761745082d325329ccce749a426059;p=linux-beck.git

Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next

Yay, thanks to Gerd for pull this together.

* 'virtio-gpu-drm-next' of git://git.kraxel.org/linux:
  Add MAINTAINERS entry for virtio-gpu.
  Add virtio gpu driver.
  drm_vblank_get: don't WARN_ON in case vblanks are not initialized
  break kconfig dependency loop
---

63e1456122761745082d325329ccce749a426059
diff --cc drivers/gpu/drm/Makefile
index eda180d5bdff,8e75f8194bde..15eb710ec114
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -58,9 -58,10 +58,10 @@@ obj-$(CONFIG_DRM_ATMEL_HLCDC)	+= atmel-
  obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
  obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
  obj-$(CONFIG_DRM_OMAP)	+= omapdrm/
 -obj-$(CONFIG_DRM_TILCDC)	+= tilcdc/
 +obj-y			+= tilcdc/
  obj-$(CONFIG_DRM_QXL) += qxl/
  obj-$(CONFIG_DRM_BOCHS) += bochs/
+ obj-$(CONFIG_DRM_VIRTIO_GPU) += virtio/
  obj-$(CONFIG_DRM_MSM) += msm/
  obj-$(CONFIG_DRM_TEGRA) += tegra/
  obj-$(CONFIG_DRM_STI) += sti/