Hi Jyri, On 12.11.2014 16:41, Jyri Sarha wrote: > Signed-off-by: Jyri Sarha <jsarha@xxxxxx> > --- > drivers/video/fbdev/omap2/dss/hdmi.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h > index a6e08ff..6d129f2 100644 > --- a/drivers/video/fbdev/omap2/dss/hdmi.h > +++ b/drivers/video/fbdev/omap2/dss/hdmi.h > @@ -345,9 +345,9 @@ void hdmi_wp_audio_config_format(struct hdmi_wp_data *wp, > struct hdmi_audio_format *aud_fmt); > void hdmi_wp_audio_config_dma(struct hdmi_wp_data *wp, > struct hdmi_audio_dma *aud_dma); > -static inline bool hdmi_mode_has_audio(int mode) > +static inline bool hdmi_mode_has_audio(struct hdmi_config *cfg) > { > - return mode == HDMI_HDMI ? true : false; > + return cfg->hdmi_dvi_mode == HDMI_HDMI ? true : false; > } > > /* HDMI DRV data */ > would it be possible for you to rearrange the changes preserving the following sequence? 1) 13/19 2) 15/19 3) 11/19 4) 14/19 5) 16/19 Otherwise I'm worried that someone's git rebase may fail. -- With best wishes, Vladimir -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html