diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-01-09 05:24:59 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-01-09 05:24:59 -0500 |
| commit | 420174afdc7023c000e5b5b1b6fe9e028470c713 (patch) | |
| tree | a50385761d11bef88689c53317d52f431bab3f9a /drivers/hid/hid-ids.h | |
| parent | e0273728564a395a13cfed70e34da4f2613d2d44 (diff) | |
| parent | 652aa6a9ac4a5f8d3e1fa3f6466646519e83c01e (diff) | |
Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus
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 448e9d89f8d0..b8574cddd953 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -125,6 +125,7 @@ | |||
| 125 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239 | 125 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239 |
| 126 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a | 126 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a |
| 127 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b | 127 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b |
| 128 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI 0x0255 | ||
| 128 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256 | 129 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256 |
| 129 | #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a | 130 | #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a |
| 130 | #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b | 131 | #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b |