diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2016-10-19 14:15:06 +0200 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 13:53:59 +0900 |
| commit | 0eb4391b48785b61383ab0c52a4f9cde40f23fbc (patch) | |
| tree | ffb361624db619126b151ef72530f20e4bd24b20 | |
| parent | 42ac5adcd32ab4531f1b344f5ac52dfc7a1b8bb7 (diff) | |
drm/bridge/sii8620: rename files according to mainline
The patch synchronizes file names with mainline.
Change-Id: I6aa491f2d7858f90055e7ea9bce00e8bb7db50e2
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
| -rw-r--r-- | drivers/gpu/drm/bridge/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/bridge/sil-sii8620.c (renamed from drivers/gpu/drm/bridge/sii8620.c) | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/bridge/sil-sii8620.h (renamed from drivers/gpu/drm/bridge/sii8620.h) | 0 | ||||
| -rw-r--r-- | include/drm/bridge/mhl.h (renamed from include/linux/mhl.h) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index 225e629f2110..cafe9a902cb8 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -3,4 +3,4 @@ ccflags-y := -Iinclude/drm obj-$(CONFIG_DRM_PS8622) += ps8622.o obj-$(CONFIG_DRM_PTN3460) += ptn3460.o obj-$(CONFIG_DRM_DW_HDMI) += dw_hdmi.o -obj-$(CONFIG_DRM_SII8620) += sii8620.o +obj-$(CONFIG_DRM_SII8620) += sil-sii8620.o diff --git a/drivers/gpu/drm/bridge/sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index f57b3aa73bd0..cb0de123fa16 100644 --- a/drivers/gpu/drm/bridge/sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -9,11 +9,13 @@ * published by the Free Software Foundation. */ +#include <drm/bridge/mhl.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/extcon.h> #include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/interrupt.h> @@ -25,9 +27,7 @@ #include <linux/regulator/consumer.h> #include <linux/slab.h> -#include <linux/extcon.h> -#include <linux/mhl.h> -#include "sii8620.h" +#include "sil-sii8620.h" #define VAL_RX_HDMI_CTRL2_DEFVAL VAL_RX_HDMI_CTRL2_IDLE_CNT(3) diff --git a/drivers/gpu/drm/bridge/sii8620.h b/drivers/gpu/drm/bridge/sil-sii8620.h index df0fbc0a1182..df0fbc0a1182 100644 --- a/drivers/gpu/drm/bridge/sii8620.h +++ b/drivers/gpu/drm/bridge/sil-sii8620.h diff --git a/include/linux/mhl.h b/include/drm/bridge/mhl.h index 10b0c627585e..10b0c627585e 100644 --- a/include/linux/mhl.h +++ b/include/drm/bridge/mhl.h |