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-hdmi.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-hdmi.c')
| -rw-r--r-- | sound/soc/sh/fsi-hdmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/fsi-hdmi.c b/sound/soc/sh/fsi-hdmi.c index 9719985eb82d..d3d9fd880680 100644 --- a/sound/soc/sh/fsi-hdmi.c +++ b/sound/soc/sh/fsi-hdmi.c @@ -83,13 +83,13 @@ static int fsi_hdmi_remove(struct platform_device *pdev) static struct fsi_hdmi_data fsi2_a_hdmi = { .cpu_dai = "fsia-dai", - .card = "FSI2A (SH MOBILE HDMI)", + .card = "FSI2A-HDMI", .id = FSI_PORT_A, }; static struct fsi_hdmi_data fsi2_b_hdmi = { .cpu_dai = "fsib-dai", - .card = "FSI2B (SH MOBILE HDMI)", + .card = "FSI2B-HDMI", .id = FSI_PORT_B, }; |