summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-cec
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2017-04-17 12:54:37 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-04-19 11:53:18 +0200
commitee7e987133c381dceea3acab27f1350936f5ec1f (patch)
treef97782a07d8bea4c4944ad5edd03ad003713caf4 /drivers/media/platform/s5p-cec
parent[media] cec: Kconfig cleanup (diff)
downloadlinux-ee7e987133c381dceea3acab27f1350936f5ec1f.tar.xz
linux-ee7e987133c381dceea3acab27f1350936f5ec1f.zip
[media] cec.h: merge cec-edid.h into cec.h
Drop the separate cec-edid.h header and merge it into cec.h. There was really no need to have a separate header for this. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/s5p-cec')
-rw-r--r--drivers/media/platform/s5p-cec/s5p_cec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c
index 4688f0879f55..664937b61fa4 100644
--- a/drivers/media/platform/s5p-cec/s5p_cec.c
+++ b/drivers/media/platform/s5p-cec/s5p_cec.c
@@ -25,7 +25,6 @@
#include <linux/timer.h>
#include <linux/workqueue.h>
#include <media/cec.h>
-#include <media/cec-edid.h>
#include <media/cec-notifier.h>
#include "exynos_hdmi_cec.h"