diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2017-04-17 07:54:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-19 06:53:18 -0300 |
| commit | ee7e987133c381dceea3acab27f1350936f5ec1f (patch) | |
| tree | f97782a07d8bea4c4944ad5edd03ad003713caf4 /drivers/media | |
| parent | 56a263aaa0a5f58d70517fae2bdd63fc1e17efec (diff) | |
[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')
| -rw-r--r-- | drivers/media/cec/cec-edid.c | 2 | ||||
| -rw-r--r-- | drivers/media/cec/cec-notifier.c | 1 | ||||
| -rw-r--r-- | drivers/media/platform/s5p-cec/s5p_cec.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/cec/cec-edid.c b/drivers/media/cec/cec-edid.c index c63dc81d2a29..38e3fec6152b 100644 --- a/drivers/media/cec/cec-edid.c +++ b/drivers/media/cec/cec-edid.c @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/types.h> -#include <media/cec-edid.h> +#include <media/cec.h> /* * This EDID is expected to be a CEA-861 compliant, which means that there are diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/cec-notifier.c index 5f5209a73665..74dc1c32080e 100644 --- a/drivers/media/cec/cec-notifier.c +++ b/drivers/media/cec/cec-notifier.c @@ -24,6 +24,7 @@ #include <linux/list.h> #include <linux/kref.h> +#include <media/cec.h> #include <media/cec-notifier.h> #include <drm/drm_edid.h> 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" |