diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-01-09 11:24:59 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-01-09 11:24:59 +0100 |
| commit | 420174afdc7023c000e5b5b1b6fe9e028470c713 (patch) | |
| tree | a50385761d11bef88689c53317d52f431bab3f9a /drivers/hid/hid-ids.h | |
| parent | Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom' and 'wiimote' into for-linus (diff) | |
| parent | hid-input/battery: add FEATURE quirk (diff) | |
| download | linux-dev-420174afdc7023c000e5b5b1b6fe9e028470c713.tar.xz linux-dev-420174afdc7023c000e5b5b1b6fe9e028470c713.zip | |
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 @@ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b +#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI 0x0255 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b |