diff options
Diffstat (limited to 'sound/usb/caiaq/device.c')
-rw-r--r-- | sound/usb/caiaq/device.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index cdfb856bddd2..45bc4a2dc6f0 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "input.h" | 36 | #include "input.h" |
37 | 37 | ||
38 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); | 38 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); |
39 | MODULE_DESCRIPTION("caiaq USB audio, version 1.3.21"); | 39 | MODULE_DESCRIPTION("caiaq USB audio"); |
40 | MODULE_LICENSE("GPL"); | 40 | MODULE_LICENSE("GPL"); |
41 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," | 41 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," |
42 | "{Native Instruments, RigKontrol3}," | 42 | "{Native Instruments, RigKontrol3}," |
@@ -46,9 +46,11 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," | |||
46 | "{Native Instruments, Audio 2 DJ}," | 46 | "{Native Instruments, Audio 2 DJ}," |
47 | "{Native Instruments, Audio 4 DJ}," | 47 | "{Native Instruments, Audio 4 DJ}," |
48 | "{Native Instruments, Audio 8 DJ}," | 48 | "{Native Instruments, Audio 8 DJ}," |
49 | "{Native Instruments, Traktor Audio 2}," | ||
49 | "{Native Instruments, Session I/O}," | 50 | "{Native Instruments, Session I/O}," |
50 | "{Native Instruments, GuitarRig mobile}" | 51 | "{Native Instruments, GuitarRig mobile}" |
51 | "{Native Instruments, Traktor Kontrol X1}"); | 52 | "{Native Instruments, Traktor Kontrol X1}" |
53 | "{Native Instruments, Traktor Kontrol S4}"); | ||
52 | 54 | ||
53 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ | 55 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ |
54 | static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ | 56 | static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ |
@@ -134,6 +136,16 @@ static struct usb_device_id snd_usb_id_table[] = { | |||
134 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | 136 | .idVendor = USB_VID_NATIVEINSTRUMENTS, |
135 | .idProduct = USB_PID_TRAKTORKONTROLX1 | 137 | .idProduct = USB_PID_TRAKTORKONTROLX1 |
136 | }, | 138 | }, |
139 | { | ||
140 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | ||
141 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | ||
142 | .idProduct = USB_PID_TRAKTORKONTROLS4 | ||
143 | }, | ||
144 | { | ||
145 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | ||
146 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | ||
147 | .idProduct = USB_PID_TRAKTORAUDIO2 | ||
148 | }, | ||
137 | { /* terminator */ } | 149 | { /* terminator */ } |
138 | }; | 150 | }; |
139 | 151 | ||