diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-09 19:06:33 +0900 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-09 19:06:33 +0900 |
commit | 3f9c42ed6b94b16223215137e648d20127261e8f (patch) | |
tree | f2d7e87156889394e3166e8d9be81f1cb95d0327 /sound/soc/sh/fsi-da7210.c | |
parent | 71ae391d45bf5d983c3cdabfa83e2afa3c99c5ab (diff) | |
parent | 2c7beb9285342e96f2ebd8ae24d708484e443a7d (diff) | |
download | op-kernel-dev-3f9c42ed6b94b16223215137e648d20127261e8f.zip op-kernel-dev-3f9c42ed6b94b16223215137e648d20127261e8f.tar.gz |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/sh/fsi-da7210.c')
-rw-r--r-- | sound/soc/sh/fsi-da7210.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c index dbafd7a..59553fd 100644 --- a/sound/soc/sh/fsi-da7210.c +++ b/sound/soc/sh/fsi-da7210.c @@ -42,7 +42,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = { }; static struct snd_soc_card fsi_soc_card = { - .name = "FSI (DA7210)", + .name = "FSI-DA7210", .dai_link = &fsi_da7210_dai, .num_links = 1, }; |