Merge commit 'efc9194bcff84' ("ASoC: hdmi-codec: callback function will be called...
authorRussell King <rmk+kernel@armlinux.org.uk>
Wed, 7 Sep 2016 12:08:48 +0000 (13:08 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Wed, 7 Sep 2016 12:08:48 +0000 (13:08 +0100)
This commit is required for the TDA998x ASoC support, so to avoid build
errors, merge this commit into this branch prior to commiting Jiri's
patches.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Trivial merge