aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 17:02:08 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 17:02:08 -0800
commit4222721ebb50a8640860eeca0caeb63fe1cce935 (patch)
treed67acdb4315e611fadc64975fd1467b2389d412d /include
parent41c57a87183a7c458d86f78966d69d4bf18ea0b7 (diff)
parent76398f9667e8369023ed5f4847fb59e9da8b6968 (diff)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: HID: fix pb_fnmode and move it to generic HID HID: fix hid-input mapping for Firefly Mini Remote Control USB HID: fix hid_blacklist clash for 0x08ca/0x0010 HID: fix memleaking of collection
Diffstat (limited to 'include')
-rw-r--r--include/linux/hid.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 770120add15..342b4e639ac 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -438,7 +438,6 @@ struct hid_device { /* device report descriptor */
struct hid_usage *, __s32);
void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
- unsigned int pb_fnmode;
unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
#endif