summaryrefslogtreecommitdiffstats
path: root/include/media/cec.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2017-05-28 10:58:04 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-06-04 20:23:35 +0200
commite94c32818d865b620c9bbd2656ab3199259ef9ec (patch)
tree13230e0861b1dd3df3e060d97169d92dc396032d /include/media/cec.h
parent[media] cec: select CEC_CORE instead of depend on it (diff)
downloadlinux-e94c32818d865b620c9bbd2656ab3199259ef9ec.tar.xz
linux-e94c32818d865b620c9bbd2656ab3199259ef9ec.zip
[media] cec: rename MEDIA_CEC_NOTIFIER to CEC_NOTIFIER
This config option is strictly speaking independent of the media subsystem since it can be used by drm as well. Besides, it looks odd when drivers select CEC_CORE and MEDIA_CEC_NOTIFIER, that's inconsistent naming. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media/cec.h')
-rw-r--r--include/media/cec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/cec.h b/include/media/cec.h
index b8eb895731d5..bfa88d4d67e1 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -173,7 +173,7 @@ struct cec_adapter {
bool passthrough;
struct cec_log_addrs log_addrs;
-#ifdef CONFIG_MEDIA_CEC_NOTIFIER
+#ifdef CONFIG_CEC_NOTIFIER
struct cec_notifier *notifier;
#endif
@@ -300,7 +300,7 @@ u16 cec_phys_addr_for_input(u16 phys_addr, u8 input);
*/
int cec_phys_addr_validate(u16 phys_addr, u16 *parent, u16 *port);
-#ifdef CONFIG_MEDIA_CEC_NOTIFIER
+#ifdef CONFIG_CEC_NOTIFIER
void cec_register_cec_notifier(struct cec_adapter *adap,
struct cec_notifier *notifier);
#endif