diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 08:16:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 08:16:25 -0700 |
commit | 424de91dd6163808729d7082de55c319e1096bee (patch) | |
tree | e75369227a1614dda3f5f37739b9c07bb847b785 /include | |
parent | bca39da5645c72048e8854340575c338b8100bca (diff) | |
parent | f8dea7a3d47ee7c857965b22e33229e7de410a88 (diff) | |
download | linux-3.10-424de91dd6163808729d7082de55c319e1096bee.tar.gz linux-3.10-424de91dd6163808729d7082de55c319e1096bee.tar.bz2 linux-3.10-424de91dd6163808729d7082de55c319e1096bee.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: remove CVS keywords
HID: Add iMON LCDs to blacklist
HID: add Microchip PICKit 1 and PICkit 2 to blacklist
HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN.
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hid.h | 3 | ||||
-rw-r--r-- | include/linux/hiddev.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 4ce3b7a979b..fe56b86f2c6 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -2,8 +2,6 @@ #define __HID_H /* - * $Id: hid.h,v 1.24 2001/12/27 10:37:41 vojtech Exp $ - * * Copyright (c) 1999 Andreas Gal * Copyright (c) 2000-2001 Vojtech Pavlik * Copyright (c) 2006-2007 Jiri Kosina @@ -285,6 +283,7 @@ struct hid_item { #define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000 #define HID_QUIRK_MICROSOFT_KEYS 0x08000000 #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 +#define HID_QUIRK_APPLE_NUMLOCK_EMULATION 0x20000000 /* * Separate quirks for runtime report descriptor fixup diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h index acbdae6d7ae..a416b904ba9 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h @@ -2,8 +2,6 @@ #define _HIDDEV_H /* - * $Id: hiddev.h,v 1.2 2001/04/26 11:26:09 vojtech Exp $ - * * Copyright (c) 1999-2000 Vojtech Pavlik * * Sponsored by SuSE |