diff options
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos7_drm_decon.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/regs-decon5433.h (renamed from include/video/exynos5433_decon.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/regs-decon7.h (renamed from include/video/exynos7_decon.h) | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 1d509a815d68..1c330f2a7a5d 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -21,13 +21,12 @@ #include <linux/pm_runtime.h> #include <linux/regmap.h> -#include <video/exynos5433_decon.h> - #include "exynos_drm_drv.h" #include "exynos_drm_crtc.h" #include "exynos_drm_fb.h" #include "exynos_drm_plane.h" #include "exynos_drm_iommu.h" +#include "regs-decon5433.h" #define DSD_CFG_MUX 0x1004 #define DSD_CFG_MUX_TE_UNMASK_GLOBAL BIT(13) diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 615efcf7782a..3931d5e33fe0 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -25,13 +25,13 @@ #include <video/of_display_timing.h> #include <video/of_videomode.h> -#include <video/exynos7_decon.h> #include "exynos_drm_crtc.h" #include "exynos_drm_plane.h" #include "exynos_drm_drv.h" #include "exynos_drm_fb.h" #include "exynos_drm_iommu.h" +#include "regs-decon7.h" /* * DECON stands for Display and Enhancement controller. diff --git a/include/video/exynos5433_decon.h b/drivers/gpu/drm/exynos/regs-decon5433.h index 78957c9626f5..78957c9626f5 100644 --- a/include/video/exynos5433_decon.h +++ b/drivers/gpu/drm/exynos/regs-decon5433.h diff --git a/include/video/exynos7_decon.h b/drivers/gpu/drm/exynos/regs-decon7.h index a62b11b613f6..339ea1007ff5 100644 --- a/include/video/exynos7_decon.h +++ b/drivers/gpu/drm/exynos/regs-decon7.h @@ -1,5 +1,4 @@ -/* include/video/exynos7_decon.h - * +/* * Copyright (c) 2014 Samsung Electronics Co., Ltd. * Author: Ajay Kumar <ajaykumar.rs@samsung.com> * |