diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 05:34:12 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 05:34:12 +0300 |
| commit | c155b914651753f843445d2f860bc00137df5d52 (patch) | |
| tree | 8a90674dfad7dd7e470d64819f8b7b490de35c2d /sound/pci/ice1712/ice1724.c | |
| parent | e9af797d757d358f60130de6ca59ee658d666561 (diff) | |
| parent | 3a5e1d1792729f384c10db966feb8bab76c991ed (diff) | |
| download | linux-c155b914651753f843445d2f860bc00137df5d52.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ice1724 - Fix a typo in IEC958 PCM name
ASoC: fix davinci-sffsdr buglet
ALSA: sound/usb: Use negated usb_endpoint_xfer_control, etc
ALSA: hda - cxt5051 report jack state
ALSA: hda - add basic jack reporting functions to patch_conexant.c
ALSA: Use usb_set/get_intfdata
ASoC: Clean up kerneldoc warnings
ASoC: Fix pxa2xx-pcm checks for invalid DMA channels
LSA: hda - Add HP Acacia detection
ALSA: hda - fix name for ALC1200
ALSA: sound/usb: use USB API functions rather than constants
ASoC: TWL4030: DAPM based capture implementation
ASoC: TWL4030: Make the enum filter generic for twl4030
Diffstat (limited to 'sound/pci/ice1712/ice1724.c')
| -rw-r--r-- | sound/pci/ice1712/ice1724.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 0dfa0540ce2c..bb8d8c766b9d 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; |