xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cando' into for-linus

Browse Source 
Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
This commit is contained in:
Jiri Kosina
2010-05-19 14:09:31 +02:00
parent ef77ad5e67 ba4d8abb31
commit 896ebc0935
5 changed files with 285 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hid/hid-ids.h
View File

@@ -127,6 +127,10 @@
#define USB_VENDOR_ID_BTC 0x046e
#define USB_DEVICE_ID_BTC_EMPREX_REMOTE 0x5578
#define USB_VENDOR_ID_CANDO 0x2087
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
#define USB_VENDOR_ID_CH 0x068e
#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2
#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4