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

Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus

Browse Source 
Conflicts:
	drivers/hid/hid-input.c
This commit is contained in:
Jiri Kosina
2014-12-12 11:09:23 +01:00
parent a32c99e7ab d1c7e29e8d 7bb9d64365
commit 3ee420ba2e
12 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -621,6 +621,7 @@
#define USB_VENDOR_ID_MADCATZ 0x0738
#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
#define USB_DEVICE_ID_MADCATZ_RAT9 0x1709
#define USB_VENDOR_ID_MCC 0x09db
#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076