diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-09-20 12:49:26 +0400 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-09-20 12:49:26 +0400 |
| commit | 611ad378b302b931670c8671f9c4d64b52a7be00 (patch) | |
| tree | efc4ed061c15f4887671b82d120c978b9b8f52b5 /include | |
| parent | 2c4ee9b579d17006ad9a83f13e3ae15c142dc41e (diff) | |
| parent | b9fde18c0582583cf12a4b1c02f621d3addd0a97 (diff) | |
| download | linux-611ad378b302b931670c8671f9c4d64b52a7be00.tar.xz | |
Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/sh_mobile_hdmi.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h index 929c2d3147bc..1e1aa54ab2e4 100644 --- a/include/video/sh_mobile_hdmi.h +++ b/include/video/sh_mobile_hdmi.h @@ -23,11 +23,11 @@ struct device; */ /* Audio source select */ -#define HDMI_SRC_MASK (0xF << 0) -#define HDMI_SRC_I2S (0 << 0) /* default */ -#define HDMI_SRC_SPDIF (1 << 0) -#define HDMI_SRC_DSD (2 << 0) -#define HDMI_SRC_HBR (3 << 0) +#define HDMI_SND_SRC_MASK (0xF << 0) +#define HDMI_SND_SRC_I2S (0 << 0) /* default */ +#define HDMI_SND_SRC_SPDIF (1 << 0) +#define HDMI_SND_SRC_DSD (2 << 0) +#define HDMI_SND_SRC_HBR (3 << 0) struct sh_mobile_hdmi_info { struct sh_mobile_lcdc_chan_cfg *lcd_chan; |