aboutsummaryrefslogtreecommitdiff
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-25 17:39:16 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-25 17:39:16 +0100
commit14ef2b0c026558d37662e5e095d59c64597d5769 (patch)
tree230c09cc65bc94384c687fed87e6ada954f80609 /drivers/hid/hid-ids.h
parent57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff)
parent71b38bd4c1cc4f2b653064357e4efab77dfd711d (diff)
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
Conflicts: drivers/hid/Kconfig
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r--drivers/hid/hid-ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index ab370f1c4b6..72c05f90553 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -59,6 +59,7 @@
#define USB_VENDOR_ID_APPLE 0x05ac
#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
+#define USB_DEVICE_ID_APPLE_MAGICMOUSE 0x030d
#define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI 0x020e
#define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO 0x020f
#define USB_DEVICE_ID_APPLE_GEYSER_ANSI 0x0214