diff options
author | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:40:40 -0700 |
---|---|---|
committer | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:45:43 -0700 |
commit | 1e11bec9b09a28f81dd3173fec6b1c6c56b5e299 (patch) | |
tree | cddb92f82bda3a5f362bb6d9f775d25dd1205e6b /drivers/hid/hid-ids.h | |
parent | 2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb (diff) | |
parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) |
Merge branch 'l2x0' of rmk tree into prima2-l2x0
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 7d27d2b0445..7484e1b6724 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -277,6 +277,7 @@ #define USB_DEVICE_ID_PENPOWER 0x00f4 #define USB_VENDOR_ID_GREENASIA 0x0e8f +#define USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD 0x3013 #define USB_VENDOR_ID_GRETAGMACBETH 0x0971 #define USB_DEVICE_ID_GRETAGMACBETH_HUEY 0x2005 |