diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
commit | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (patch) | |
tree | 73a224bf0371b41c9777c2bad8169ed50bcca879 /sound/soc/fsl/mpc8610_hpcd.c | |
parent | d0f47ff17f29740eabbd64e11705b7332241714c (diff) | |
parent | 5ec65ee589fdaca7298b6303fd74ad6c121a8f38 (diff) |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
Linus decided to go for another week so here's a few more updates - a
mixed bag here, a few minor diagnostic tweaks, some driver enhancements
and the dmaengine conversion for ep93xx drivers which was tested a while
ago and just waiting for a signoff.
Diffstat (limited to 'sound/soc/fsl/mpc8610_hpcd.c')
-rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index fcf9302f59b..afbabf427f2 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -546,7 +546,7 @@ static struct platform_driver mpc8610_hpcd_driver = { .probe = mpc8610_hpcd_probe, .remove = __devexit_p(mpc8610_hpcd_remove), .driver = { - /* The name must match the 'model' property in the device tree, + /* The name must match 'compatible' property in the device tree, * in lowercase letters. */ .name = "snd-soc-mpc8610hpcd", |