git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
sound
/
soc
/
sh
/
fsi-hdmi.c
diff --git
a/sound/soc/sh/fsi-hdmi.c
b/sound/soc/sh/fsi-hdmi.c
index
9719985
..
d3d9fd8
100644
(file)
--- 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",
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",
.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,
};
.id = FSI_PORT_B,
};