diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 19:39:16 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 19:39:16 +0300 |
| commit | 14ef2b0c026558d37662e5e095d59c64597d5769 (patch) | |
| tree | 230c09cc65bc94384c687fed87e6ada954f80609 /drivers/hid/hid-ids.h | |
| parent | 57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff) | |
| parent | 71b38bd4c1cc4f2b653064357e4efab77dfd711d (diff) | |
| download | linux-14ef2b0c026558d37662e5e095d59c64597d5769.tar.xz | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index ab370f1c4b6e..72c05f90553c 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 |