diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
| commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
| tree | d2cebc7039954851998d592123899f5627def7a9 /drivers/hid/usbhid/hiddev.c | |
| parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Diffstat (limited to 'drivers/hid/usbhid/hiddev.c')
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index fedd88df9a18..984feb351a5a 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <linux/smp_lock.h> | ||
| 33 | #include <linux/input.h> | 32 | #include <linux/input.h> |
| 34 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
| 35 | #include <linux/hid.h> | 34 | #include <linux/hid.h> |