diff options
Diffstat (limited to 'drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c')
| -rw-r--r-- | drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c index 7b524de831a..f503c9d12b2 100644 --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c +++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | |||
| @@ -29,8 +29,7 @@ | |||
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/seq_file.h> | 30 | #include <linux/seq_file.h> |
| 31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
| 32 | #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \ | 32 | #if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) |
| 33 | defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE) | ||
| 34 | #include <sound/asound.h> | 33 | #include <sound/asound.h> |
| 35 | #endif | 34 | #endif |
| 36 | 35 | ||
| @@ -1024,8 +1023,7 @@ void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s) | |||
| 1024 | DUMPPHY(HDMI_TXPHY_PAD_CFG_CTRL); | 1023 | DUMPPHY(HDMI_TXPHY_PAD_CFG_CTRL); |
| 1025 | } | 1024 | } |
| 1026 | 1025 | ||
| 1027 | #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \ | 1026 | #if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) |
| 1028 | defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE) | ||
| 1029 | void hdmi_wp_audio_config_format(struct hdmi_ip_data *ip_data, | 1027 | void hdmi_wp_audio_config_format(struct hdmi_ip_data *ip_data, |
| 1030 | struct hdmi_audio_format *aud_fmt) | 1028 | struct hdmi_audio_format *aud_fmt) |
| 1031 | { | 1029 | { |