diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 17:39:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 17:39:52 +0100 |
| commit | 9c1852b459f04f6309e40d1d167512b0a5598529 (patch) | |
| tree | a74526f1fe3f9826b81327f0b9ba9b98a543f87c /sound/soc/codecs | |
| parent | ASoC: samsung: i2s: Provide I2S device for registered clocks (diff) | |
| parent | Linux 4.10-rc1 (diff) | |
| download | linux-9c1852b459f04f6309e40d1d167512b0a5598529.tar.xz linux-9c1852b459f04f6309e40d1d167512b0a5598529.zip | |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/hdac_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index c602c4960924..0c6228a0bf95 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1368,7 +1368,7 @@ static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev, return hdac_hdmi_init_dai_map(edev); } -static void hdac_hdmi_eld_notify_cb(void *aptr, int port) +static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe) { struct hdac_ext_device *edev = aptr; struct hdac_hdmi_priv *hdmi = edev->private_data; |