summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-11 11:17:16 +0100
committerMark Brown <broonie@linaro.org>2013-09-11 11:17:16 +0100
commite695e7a47d8d6e35255e17ded9409684a7dc0fa1 (patch)
tree0c5c0640da71287cb5dfadfecff74657d04c3d3f /sound/soc
parentc34c0d7684b8b79666da6b1bc37fc330cd0dd216 (diff)
parentd098b2f0cf6280f2b7b0415b48921385fdc1861f (diff)
downloadop-kernel-dev-e695e7a47d8d6e35255e17ded9409684a7dc0fa1.zip
op-kernel-dev-e695e7a47d8d6e35255e17ded9409684a7dc0fa1.tar.gz
Merge remote-tracking branch 'asoc/fix/kirkwood' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/kirkwood/kirkwood-i2s.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 7fce340..0f3d73d 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -559,7 +559,8 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
#ifdef CONFIG_OF
static struct of_device_id mvebu_audio_of_match[] = {
- { .compatible = "marvell,mvebu-audio" },
+ { .compatible = "marvell,kirkwood-audio" },
+ { .compatible = "marvell,dove-audio" },
{ }
};
MODULE_DEVICE_TABLE(of, mvebu_audio_of_match);
OpenPOWER on IntegriCloud