diff options
| -rw-r--r-- | contrib/test/mc_nextgen_test.c | 2 | ||||
| -rw-r--r-- | include/linux/media.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/contrib/test/mc_nextgen_test.c b/contrib/test/mc_nextgen_test.c index a62fd13e..4905d8d0 100644 --- a/contrib/test/mc_nextgen_test.c +++ b/contrib/test/mc_nextgen_test.c @@ -249,6 +249,7 @@ static inline const char *ent_function(uint32_t function) case MEDIA_ENT_F_AUDIO_MIXER: return "Audio Mixer"; +#if 0 /* Connectors */ case MEDIA_ENT_F_CONN_RF: return "RF connector"; @@ -256,6 +257,7 @@ static inline const char *ent_function(uint32_t function) return "S-Video connector"; case MEDIA_ENT_F_CONN_COMPOSITE: return "Composite connector"; +#endif /* Entities based on MEDIA_ENT_F_OLD_BASE */ case MEDIA_ENT_F_IO_V4L: diff --git a/include/linux/media.h b/include/linux/media.h index 7f54b617..64e749ff 100644 --- a/include/linux/media.h +++ b/include/linux/media.h @@ -96,9 +96,6 @@ struct media_device_info { * Connectors */ /* It is a responsibility of the entity drivers to add connectors and links */ -#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001) -#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002) -#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003) /* * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and |