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

[sfrench/cifs-2.6.git] / drivers / gpu / drm / vboxvideo / vbox_mode.c

diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c
index 9432c3ceec7cede6aa29ad66bba31940e599266a..e1e48ba919ebfac42f34d77db19b24244b700d00 100644 (file)
--- a/drivers/gpu/drm/vboxvideo/vbox_mode.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c
@@ -57,8 +57,7 @@ static void vbox_do_modeset(struct drm_crtc *crtc)
                vbox_write_ioport(VBE_DISPI_INDEX_VIRT_WIDTH, pitch * 8 / bpp);
                vbox_write_ioport(VBE_DISPI_INDEX_BPP, bpp);
                vbox_write_ioport(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED);
-               vbox_write_ioport(
-                       VBE_DISPI_INDEX_X_OFFSET,
+               vbox_write_ioport(VBE_DISPI_INDEX_X_OFFSET,
                        vbox_crtc->fb_offset % pitch / bpp * 8 + vbox_crtc->x);
                vbox_write_ioport(VBE_DISPI_INDEX_Y_OFFSET,
                                  vbox_crtc->fb_offset / pitch + vbox_crtc->y);