diff options
author | Jaroslav Kysela <perex@perex.cz> | 2010-04-16 10:37:41 +0200 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2010-04-16 10:37:41 +0200 |
commit | f09d045e2a61d2fdae3d0127208f18c9f44acf80 (patch) | |
tree | edbe84444ac4e6f1d52aa87aef2e2e7d008fcb16 /sound/usb/caiaq/device.c | |
parent | dc57da3875f527b1cc195ea4ce5bd32e1e68433d (diff) | |
parent | 27762b2ce16d5c6f7bc8ab1aad1b9179076f997a (diff) |
Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
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 afc5aeb6800..80527182767 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 */ } }; |