diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-11 10:39:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-11 10:39:18 -0800 |
| commit | 28806e4d9b97865b450d72156e9ad229f2067f0b (patch) | |
| tree | c45a35e186f1485d9305cbd6cc20a4644a2c3083 /include | |
| parent | a74e6a014c9d4d4161061f770c9b4f98372ac778 (diff) | |
| parent | 2025a48cfd92d541c5ee47deee97f8a46d00c4ac (diff) | |
| download | linux-28806e4d9b97865b450d72156e9ad229f2067f0b.tar.bz2 | |
Merge tag 'media/v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"A couple of fixes:
- fix a build issue with CEC
- fix a deadlock at usbtv driver
- fix some null pointer address issues at vsp1 driver
- fix a wrong bitmap setting at rkisp1 driver"
* tag 'media/v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: rkisp1: params: fix wrong bits settings
media: v4l: vsp1: Fix uif null pointer access
media: v4l: vsp1: Fix bru null pointer access
media: usbtv: Fix deadlock on suspend
media: rc: compile rc-cec.c into rc-core
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/rc-map.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/media/rc-map.h b/include/media/rc-map.h index 999b750bc6b8..30f138ebab6f 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h @@ -175,6 +175,13 @@ struct rc_map_list { struct rc_map map; }; +#ifdef CONFIG_MEDIA_CEC_RC +/* + * rc_map_list from rc-cec.c + */ +extern struct rc_map_list cec_map; +#endif + /* Routines from rc-map.c */ /** |