[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.18' - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_dma.h    |    2 +-
 drivers/gpu/drm/openchrome/openchrome_h1_dma.c |    1 -
 drivers/gpu/drm/openchrome/via_drv.h           |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 48c89757fee0fec2f3499326011e3a802a0523aa
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Apr 26 19:23:40 2018 -0700

    drm/openchrome: Rename via_dma.h to openchrome_dma.h
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_dma.h b/drivers/gpu/drm/openchrome/openchrome_dma.h
similarity index 98%
rename from drivers/gpu/drm/openchrome/via_dma.h
rename to drivers/gpu/drm/openchrome/openchrome_dma.h
index cbdade4525a1..a6912bdbdbd0 100644
--- a/drivers/gpu/drm/openchrome/via_dma.h
+++ b/drivers/gpu/drm/openchrome/openchrome_dma.h
@@ -1,4 +1,4 @@
-/* via_dma.h -- PCI DMA BitBlt support for the VIA Unichrome/Pro
+/* openchrome_dma.h -- PCI DMA BitBlt support for VIA Unichrome/Pro
  *
  * Copyright 2005 Thomas Hellstrom.
  * All Rights Reserved.
diff --git a/drivers/gpu/drm/openchrome/openchrome_h1_dma.c b/drivers/gpu/drm/openchrome/openchrome_h1_dma.c
index 1075feef2c96..f1a43be37961 100644
--- a/drivers/gpu/drm/openchrome/openchrome_h1_dma.c
+++ b/drivers/gpu/drm/openchrome/openchrome_h1_dma.c
@@ -27,7 +27,6 @@
  */
 #include <drm/drmP.h>
 #include "via_drv.h"
-#include "via_dma.h"
 
 /*
  * Fire a blit engine.
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index 38a4ca1fbdc0..dd63590663bf 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -50,8 +50,8 @@
 #include <drm/drm_gem.h>
 #include <drm/via_drm.h>
 
-#include "via_dma.h"
 #include "via_display.h"
+#include "openchrome_dma.h"
 #include "openchrome_fence.h"
 #include "openchrome_regs.h"
 #include "openchrome_verifier.h"