diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-03 15:44:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-03 15:44:19 +0100 |
| commit | fff222431850e3334f3211792d69aad1c854243b (patch) | |
| tree | ec53b4150b324dda3ecba812dfd8334f59c35344 /include | |
| parent | 916ff5e2abb0d556e46c33ee672575efb1c3757d (diff) | |
| parent | 8dac27bfa2f994ecb11f01a63641527d17d48fc1 (diff) | |
| download | linux-next-fff222431850e3334f3211792d69aad1c854243b.tar.gz linux-next-fff222431850e3334f3211792d69aad1c854243b.zip | |
Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/media-entity.h | 1 | ||||
| -rw-r--r-- | include/media/rc-map.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/media/media-entity.h b/include/media/media-entity.h index d9b72cd87d52..fa393e840669 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -1387,6 +1387,7 @@ void media_remove_intf_links(struct media_interface *intf); * @entity: entity where the @operation will be called * @operation: type of the operation. Should be the name of a member of * struct &media_entity_operations. + * @args: arguments for the operation. * * This helper function will check if @operation is not %NULL. On such case, * it will issue a call to @operation\(@entity, @args\). diff --git a/include/media/rc-map.h b/include/media/rc-map.h index d90e4611b066..d95ed3e96de2 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h @@ -262,7 +262,6 @@ struct rc_map *rc_map_get(const char *name); #define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce" #define RC_MAP_GOTVIEW7135 "rc-gotview7135" #define RC_MAP_HAUPPAUGE "rc-hauppauge" -#define RC_MAP_HAUPPAUGE_NEW "rc-hauppauge" #define RC_MAP_HISI_POPLAR "rc-hisi-poplar" #define RC_MAP_HISI_TV_DEMO "rc-hisi-tv-demo" #define RC_MAP_IMON_MCE "rc-imon-mce" @@ -309,7 +308,6 @@ struct rc_map *rc_map_get(const char *name); #define RC_MAP_PROTEUS_2309 "rc-proteus-2309" #define RC_MAP_PURPLETV "rc-purpletv" #define RC_MAP_PV951 "rc-pv951" -#define RC_MAP_RC5_TV "rc-rc5-tv" #define RC_MAP_RC6_MCE "rc-rc6-mce" #define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys" #define RC_MAP_REDDO "rc-reddo" |