diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-13 07:58:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-13 07:58:50 -0800 |
| commit | d8ed516f82f0f4cda11282450512310ab273637e (patch) | |
| tree | 1a7fca8ce0280712a9dd72c7bf1b4e3d9983355a /sound/usb/quirks-table.h | |
| parent | f00eaeea7a42b5ea327e9ce8839cb0b53d3bdb4e (diff) | |
| parent | 61461241187c9903382f98620b26b201df521c82 (diff) | |
| download | kernel_samsung_smdk4412-d8ed516f82f0f4cda11282450512310ab273637e.zip kernel_samsung_smdk4412-d8ed516f82f0f4cda11282450512310ab273637e.tar.gz kernel_samsung_smdk4412-d8ed516f82f0f4cda11282450512310ab273637e.tar.bz2 | |
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: hda - add quirk for Ordissimo EVE using a realtek ALC662
ALSA: hrtimer: remove superfluous tasklet invocation
ALSA: hrtimer: handle delayed timer interrupts
ALSA: HDA: Add subwoofer quirk for Acer Aspire 8942G
ALSA: hda - Don't handle empty patch files
ALSA: hda - Fix missing CA initialization for HDMI/DP
ALSA: usbaudio - Enable the E-MU 0204 USB
ALSA: hda - switch lfe with side in mixer for 4930g
ASoC: Improve WM8994 digital power sequencing
ASoC: Create an AIF1ADCDAT signal widget to match AIF2
asoc: davinci: da830/omap-l137: correct cpu_dai_name
ASoC: fill in snd_soc_pcm_runtime.card before calling snd_soc_dai_link.init()
Diffstat (limited to 'sound/usb/quirks-table.h')
| -rw-r--r-- | sound/usb/quirks-table.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 3599987..921a86f 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -79,6 +79,13 @@ .idProduct = 0x3f0a, .bInterfaceClass = USB_CLASS_AUDIO, }, +{ + /* E-Mu 0204 USB */ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x041e, + .idProduct = 0x3f19, + .bInterfaceClass = USB_CLASS_AUDIO, +}, /* * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface |