git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
sound
/
usb
/
caiaq
/
device.h
diff --git
a/sound/usb/caiaq/device.h
b/sound/usb/caiaq/device.h
index
3f9c633
..
562b0bf
100644
(file)
--- a/
sound/usb/caiaq/device.h
+++ b/
sound/usb/caiaq/device.h
@@
-18,6
+18,7
@@
#define USB_PID_TRAKTORKONTROLX1 0x2305
#define USB_PID_TRAKTORKONTROLS4 0xbaff
#define USB_PID_TRAKTORAUDIO2 0x041d
+#define USB_PID_MASCHINECONTROLLER 0x0808
#define EP1_BUFSIZE 64
#define EP4_BUFSIZE 512