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

Merge branch 'acrux' into for-linus

Browse Source 
Conflicts:
	drivers/hid/hid-ids.h
This commit is contained in:
Jiri Kosina
2010-08-04 15:29:35 +02:00
parent 9929ffed88 7d3d42a795
commit 35d03a0d9b
5 changed files with 187 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,9 @@
#define USB_DEVICE_ID_ACECAD_FLAIR 0x0004
#define USB_DEVICE_ID_ACECAD_302 0x0008
#define USB_VENDOR_ID_ADS_TECH 0x06e1
#define USB_VENDOR_ID_ACRUX 0x1a34
#define USB_VENDOR_ID_ADS_TECH 0x06e1
#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155
#define USB_VENDOR_ID_AFATECH 0x15a4