summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-05 18:34:25 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-05 18:34:25 +0100
commit3a5e1d1792729f384c10db966feb8bab76c991ed (patch)
treec62f5a3afb16fc8e10e04cb1dd972d9ef5e47f25 /sound
parent9d7eff608dbccceb3a5168bd240dc6262ae42459 (diff)
parent8eca75382e012b74b98526a1679ada2a1849024b (diff)
downloadop-kernel-dev-3a5e1d1792729f384c10db966feb8bab76c991ed.zip
op-kernel-dev-3a5e1d1792729f384c10db966feb8bab76c991ed.tar.gz
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ice1712/ice1724.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 0dfa054..bb8d8c7 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -1239,7 +1239,7 @@ static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device)
if (ice->force_pdma4 || ice->force_rdma1)
name = "ICE1724 Secondary";
else
- name = "IEC1724 IEC958";
+ name = "ICE1724 IEC958";
err = snd_pcm_new(ice->card, name, device, play, capt, &pcm);
if (err < 0)
return err;
OpenPOWER on IntegriCloud