diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:16 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:16 -0400 |
| commit | e695e7a47d8d6e35255e17ded9409684a7dc0fa1 (patch) | |
| tree | 0c5c0640da71287cb5dfadfecff74657d04c3d3f /sound | |
| parent | c34c0d7684b8b79666da6b1bc37fc330cd0dd216 (diff) | |
| parent | d098b2f0cf6280f2b7b0415b48921385fdc1861f (diff) | |
Merge remote-tracking branch 'asoc/fix/kirkwood' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 7fce340ab3ef..0f3d73d4ef48 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) | |||
| 559 | 559 | ||
| 560 | #ifdef CONFIG_OF | 560 | #ifdef CONFIG_OF |
| 561 | static struct of_device_id mvebu_audio_of_match[] = { | 561 | static struct of_device_id mvebu_audio_of_match[] = { |
| 562 | { .compatible = "marvell,mvebu-audio" }, | 562 | { .compatible = "marvell,kirkwood-audio" }, |
| 563 | { .compatible = "marvell,dove-audio" }, | ||
| 563 | { } | 564 | { } |
| 564 | }; | 565 | }; |
| 565 | MODULE_DEVICE_TABLE(of, mvebu_audio_of_match); | 566 | MODULE_DEVICE_TABLE(of, mvebu_audio_of_match); |