diff --git a/[refs] b/[refs] index b81ec497b582..3c5de18ce1d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83aaf13c5ba5e1e244339807d8a752808e763cdd +refs/heads/master: cb2c7b4927c8f376b7ba9557978d8c59ed472664 diff --git a/trunk/include/media/cx2341x.h b/trunk/include/media/cx2341x.h index d91d88f93c8b..ecad55bf0162 100644 --- a/trunk/include/media/cx2341x.h +++ b/trunk/include/media/cx2341x.h @@ -49,7 +49,7 @@ struct cx2341x_mpeg_params { enum v4l2_mpeg_audio_mode_extension audio_mode_extension; enum v4l2_mpeg_audio_emphasis audio_emphasis; enum v4l2_mpeg_audio_crc audio_crc; - u8 audio_properties; + u16 audio_properties; /* video */ enum v4l2_mpeg_video_encoding video_encoding;