drivers/gpu/drm/openchrome/openchrome_analog.c | 2 +-
drivers/gpu/drm/openchrome/openchrome_crtc_hw.c | 3 ++-
drivers/gpu/drm/openchrome/openchrome_display.h | 3 ++-
drivers/gpu/drm/openchrome/via_drv.h | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit d51ead4752d95bbb209a1d85e62c7ca0daa232ca
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Apr 28 23:06:34 2018 -0700
drm/openchrome: Rename crtc_hw.h to openchrome_crtc_hw.h
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_analog.c
b/drivers/gpu/drm/openchrome/openchrome_analog.c
index 9feec220a482..32a15a2f1537 100644
--- a/drivers/gpu/drm/openchrome/openchrome_analog.c
+++ b/drivers/gpu/drm/openchrome/openchrome_analog.c
@@ -24,7 +24,7 @@
* James Simmons <jsimm...@infradead.org>
*/
#include "via_drv.h"
-#include "crtc_hw.h"
+#include "openchrome_crtc_hw.h"
/*
diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc_hw.c
b/drivers/gpu/drm/openchrome/openchrome_crtc_hw.c
index f71c14ed2ac8..a7b04e4c69cd 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc_hw.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc_hw.c
@@ -23,7 +23,8 @@
*/
#include <video/vga.h>
-#include "crtc_hw.h"
+
+#include "openchrome_crtc_hw.h"
/*
* load_register_table enables the ability to set entire
diff --git a/drivers/gpu/drm/openchrome/crtc_hw.h
b/drivers/gpu/drm/openchrome/openchrome_crtc_hw.h
similarity index 100%
rename from drivers/gpu/drm/openchrome/crtc_hw.h
rename to drivers/gpu/drm/openchrome/openchrome_crtc_hw.h
diff --git a/drivers/gpu/drm/openchrome/openchrome_display.h
b/drivers/gpu/drm/openchrome/openchrome_display.h
index 5aee32723bca..fafa8e70e49c 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.h
+++ b/drivers/gpu/drm/openchrome/openchrome_display.h
@@ -24,7 +24,6 @@
#define _VIA_DISPLAY_H_
#include <video/vga.h>
-#include "crtc_hw.h"
#include "drm_edid.h"
#include "drm_crtc.h"
@@ -32,6 +31,8 @@
#include "drm_plane_helper.h"
#include "drm_fb_helper.h"
+#include "openchrome_crtc_hw.h"
+
/* IGA Scaling disable */
#define VIA_NO_SCALING 0
commit 6dbbb999e73b0bf19a7efc09d5ca92d7968984db
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sat Apr 28 22:37:24 2018 -0700
drm/openchrome: Rename via_display.h to openchrome_display.h
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_display.h
b/drivers/gpu/drm/openchrome/openchrome_display.h
similarity index 100%
rename from drivers/gpu/drm/openchrome/via_display.h
rename to drivers/gpu/drm/openchrome/openchrome_display.h
diff --git a/drivers/gpu/drm/openchrome/via_drv.h
b/drivers/gpu/drm/openchrome/via_drv.h
index dd63590663bf..c3f8d2a11d41 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -50,7 +50,7 @@
#include <drm/drm_gem.h>
#include <drm/via_drm.h>
-#include "via_display.h"
+#include "openchrome_display.h"
#include "openchrome_dma.h"
#include "openchrome_fence.h"
#include "openchrome_regs.h"
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
