diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:58:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:58:57 +0200 |
| commit | 3374cd1abd478f767aaedf2c21d109596ff0fe72 (patch) | |
| tree | 46b00a571ba5d86373bd9054fdccc5dc6e28e42f /sound/usb/caiaq/device.c | |
| parent | Linus 2.6.34 (diff) | |
| parent | ALSA: opl4 - Fix a wrong argument in proc write callback (diff) | |
| download | linux-3374cd1abd478f767aaedf2c21d109596ff0fe72.tar.xz linux-3374cd1abd478f767aaedf2c21d109596ff0fe72.zip | |
Merge branch 'topic/core-cleanup' into for-linus
Diffstat (limited to 'sound/usb/caiaq/device.c')
| -rw-r--r-- | sound/usb/caiaq/device.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index afc5aeb68005..805271827675 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -47,7 +47,8 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," "{Native Instruments, Audio 4 DJ}," "{Native Instruments, Audio 8 DJ}," "{Native Instruments, Session I/O}," - "{Native Instruments, GuitarRig mobile}"); + "{Native Instruments, GuitarRig mobile}" + "{Native Instruments, Traktor Kontrol X1}"); static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ @@ -128,6 +129,11 @@ static struct usb_device_id snd_usb_id_table[] = { .idVendor = USB_VID_NATIVEINSTRUMENTS, .idProduct = USB_PID_AUDIO2DJ }, + { + .match_flags = USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = USB_VID_NATIVEINSTRUMENTS, + .idProduct = USB_PID_TRAKTORKONTROLX1 + }, { /* terminator */ } }; |