staging: vboxvideo: Drop DRM_MODE_FB_CMD define

This is a leftover from when the driver was out of tree and also build
against older kernels.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vboxvideo/vbox_drv.h b/drivers/staging/vboxvideo/vbox_drv.h
index cb0bc9201a7f7511c5c781f3aeab1631631eae9c..e2a6b2b5bfc3ad65663db79376ad67db37ee84d4 100644 (file)
--- a/drivers/staging/vboxvideo/vbox_drv.h
+++ b/drivers/staging/vboxvideo/vbox_drv.h
@@ -164,8 +164,6 @@ void vbox_hw_fini(struct vbox_private *vbox);
 int vbox_mode_init(struct vbox_private *vbox);
 void vbox_mode_fini(struct vbox_private *vbox);
 
-#define DRM_MODE_FB_CMD drm_mode_fb_cmd2
-
 void vbox_report_caps(struct vbox_private *vbox);
 
 void vbox_framebuffer_dirty_rectangles(struct drm_framebuffer *fb,
@@ -174,7 +172,7 @@ void vbox_framebuffer_dirty_rectangles(struct drm_framebuffer *fb,
 
 int vbox_framebuffer_init(struct vbox_private *vbox,
                          struct vbox_framebuffer *vbox_fb,
-                         const struct DRM_MODE_FB_CMD *mode_cmd,
+                         const struct drm_mode_fb_cmd2 *mode_cmd,
                          struct drm_gem_object *obj);
 
 int vboxfb_create(struct drm_fb_helper *helper,

diff --git a/drivers/staging/vboxvideo/vbox_fb.c b/drivers/staging/vboxvideo/vbox_fb.c
index 9a2afe74bef21da2fb7df6fde33f151c06e05ce0..4182ff954984e572c8ec71fc850864729af2ec82 100644 (file)
--- a/drivers/staging/vboxvideo/vbox_fb.c
+++ b/drivers/staging/vboxvideo/vbox_fb.c
@@ -51,7 +51,7 @@ int vboxfb_create(struct drm_fb_helper *helper,
        struct vbox_private *vbox =
                container_of(helper, struct vbox_private, fb_helper);
        struct pci_dev *pdev = vbox->ddev.pdev;
-       struct DRM_MODE_FB_CMD mode_cmd;
+       struct drm_mode_fb_cmd2 mode_cmd;
        struct drm_framebuffer *fb;
        struct fb_info *info;
        struct drm_gem_object *gobj;

diff --git a/drivers/staging/vboxvideo/vbox_main.c b/drivers/staging/vboxvideo/vbox_main.c
index 26a90ec9e3d01300367b5dd8bd6a6e4c4f266b6e..e1fb70a42d320c8cfde625e8b60565c4497fc304 100644 (file)
--- a/drivers/staging/vboxvideo/vbox_main.c
+++ b/drivers/staging/vboxvideo/vbox_main.c
@@ -103,7 +103,7 @@ static const struct drm_framebuffer_funcs vbox_fb_funcs = {
 
 int vbox_framebuffer_init(struct vbox_private *vbox,
                          struct vbox_framebuffer *vbox_fb,
-                         const struct DRM_MODE_FB_CMD *mode_cmd,
+                         const struct drm_mode_fb_cmd2 *mode_cmd,
                          struct drm_gem_object *obj)
 {
        int ret;