diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 16:41:21 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 16:41:21 (GMT) |
commit | 8dbd2879e33be37adf40f747a5fb80ef1a6cd150 (patch) | |
tree | c688d7980be8c1c0dbf5e411caaf2c102120102e /drivers/hid/hid-ids.h | |
parent | b770ea523d95837e968d46c7fe09a3f5edd9bb27 (diff) | |
parent | d308ba50a1234b299a00e63a95e61fdeb2f1a2df (diff) | |
download | linux-fsl-qoriq-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.tar.xz |
Merge branch 'omap/dt' into next/drivers
Needed for the omap timer changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 269b509..9d7a428 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -118,6 +118,9 @@ #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252 #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253 #define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254 +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI 0x0259 +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI 0x0249 #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO 0x024a #define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS 0x024b |