| commit | 3a5e1d1792729f384c10db966feb8bab76c991ed | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Jan 05 18:34:25 2009 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Jan 05 18:34:25 2009 +0100 |
| tree | c62f5a3afb16fc8e10e04cb1dd972d9ef5e47f25 | |
| parent | 9d7eff608dbccceb3a5168bd240dc6262ae42459 [diff] | |
| parent | 8eca75382e012b74b98526a1679ada2a1849024b [diff] |
Merge branch 'topic/misc' into for-linus
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 @@ 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;