diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 08:33:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 08:33:59 -0800 |
| commit | c07f62e5f18123103459ff74e86af1518a5b8af5 (patch) | |
| tree | f78ac0b31c730f1c6c3a2dfa08c2944b84a3efb5 /drivers/hid/usbhid/usbhid.h | |
| parent | e5404586a499f7dce915456e85ff94b2df7a3b1c (diff) | |
| parent | ee8a1a0a1a5817accd03ced7e7ffde3a4430f485 (diff) | |
| download | kernel-crypto-c07f62e5f18123103459ff74e86af1518a5b8af5.tar.gz kernel-crypto-c07f62e5f18123103459ff74e86af1518a5b8af5.tar.xz kernel-crypto-c07f62e5f18123103459ff74e86af1518a5b8af5.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: Apple ALU wireless keyboards are bluetooth devices
HID: remove setup mutex, fix possible deadlock
HID: add USB ID for another dual gameron adapter
HID: unignore mouse on unibody macbooks
HID: fix blacklist entries for greenasia/pantherlord
Diffstat (limited to 'drivers/hid/usbhid/usbhid.h')
| -rw-r--r-- | drivers/hid/usbhid/usbhid.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index 55973ff5400..332abcdf995 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h @@ -74,7 +74,6 @@ struct usbhid_device { dma_addr_t outbuf_dma; /* Output buffer dma */ spinlock_t outlock; /* Output fifo spinlock */ - struct mutex setup; unsigned long iofl; /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */ struct timer_list io_retry; /* Retry timer */ unsigned long stop_retry; /* Time to give up, in jiffies */ |