Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / vmwgfx / vmwgfx_drv.h

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index c6b1eb5952bccc5bc84e739901bff156e7597127..ffddccff867b623208a28b4308c13fbdba5785db 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -1114,10 +1114,29 @@ extern void vmw_generic_waiter_remove(struct vmw_private *dev_priv,
  * Kernel framebuffer - vmwgfx_fb.c
  */
 
+#ifdef CONFIG_DRM_FBDEV_EMULATION
 int vmw_fb_init(struct vmw_private *vmw_priv);
 int vmw_fb_close(struct vmw_private *dev_priv);
 int vmw_fb_off(struct vmw_private *vmw_priv);
 int vmw_fb_on(struct vmw_private *vmw_priv);
+#else
+static inline int vmw_fb_init(struct vmw_private *vmw_priv)
+{
+       return 0;
+}
+static inline int vmw_fb_close(struct vmw_private *dev_priv)
+{
+       return 0;
+}
+static inline int vmw_fb_off(struct vmw_private *vmw_priv)
+{
+       return 0;
+}
+static inline int vmw_fb_on(struct vmw_private *vmw_priv)
+{
+       return 0;
+}
+#endif
 
 /**
  * Kernel modesetting - vmwgfx_kms.c