aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/cx2341x.h2
-rw-r--r--include/media/ir-common.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h
index d91d88f93c8b..ecad55bf0162 100644
--- a/include/media/cx2341x.h
+++ b/include/media/cx2341x.h
@@ -49,7 +49,7 @@ struct cx2341x_mpeg_params {
49 enum v4l2_mpeg_audio_mode_extension audio_mode_extension; 49 enum v4l2_mpeg_audio_mode_extension audio_mode_extension;
50 enum v4l2_mpeg_audio_emphasis audio_emphasis; 50 enum v4l2_mpeg_audio_emphasis audio_emphasis;
51 enum v4l2_mpeg_audio_crc audio_crc; 51 enum v4l2_mpeg_audio_crc audio_crc;
52 u8 audio_properties; 52 u16 audio_properties;
53 53
54 /* video */ 54 /* video */
55 enum v4l2_mpeg_video_encoding video_encoding; 55 enum v4l2_mpeg_video_encoding video_encoding;
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 2b25f5c95006..4bb0ad810179 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -24,6 +24,7 @@
24#define _IR_COMMON 24#define _IR_COMMON
25 25
26#include <linux/input.h> 26#include <linux/input.h>
27#include <linux/workqueue.h>
27 28
28#define IR_TYPE_RC5 1 29#define IR_TYPE_RC5 1
29#define IR_TYPE_PD 2 /* Pulse distance encoded IR */ 30#define IR_TYPE_PD 2 /* Pulse distance encoded IR */