diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 20:05:59 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 20:05:59 +0400 |
| commit | 524196d2ad12cfe29e15d3db7b8d678dde35b5f7 (patch) | |
| tree | 7fb051f346c0b17e82aaef55f7e11ab1eb2f7675 /sound/soc/sh/fsi-da7210.c | |
| parent | d36c30181c4cf6ead34ae30fa2c777b871225c87 (diff) | |
| parent | b793eb60a01d5b5e4aaeb2fbc2b036dec0d9f84d (diff) | |
| download | linux-524196d2ad12cfe29e15d3db7b8d678dde35b5f7.tar.xz | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Correct WM8994 MICBIAS supply widget hookup
ASoC: Fix shift in WM8958 accessory detection default implementation
ASoC: sh: fsi-hdmi: fixup snd_soc_card name
ASoC: sh: fsi-da7210: fixup snd_soc_card name
ASoC: sh: fsi-ak4642: fixup snd_soc_card name
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 dbafd7ac5590..59553fd8c2fb 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, }; |