diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-22 22:40:42 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-22 22:40:42 +0200 |
| commit | df7976797fa9af161690dbf4dee81ed92cdc150f (patch) | |
| tree | be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3 /sound/soc/sh/fsi-hdmi.c | |
| parent | drm/i915: Skip GPU wait for scanout pin while wedged (diff) | |
| parent | drm/i915: load the LUT before pipe enable on ILK+ (diff) | |
| download | linux-df7976797fa9af161690dbf4dee81ed92cdc150f.tar.xz linux-df7976797fa9af161690dbf4dee81ed92cdc150f.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
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, }; |