diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
| commit | 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch) | |
| tree | 59b597e44902d8db8bde7deac1e7e707327c6fe6 /drivers/media/video/pwc/pwc-if.c | |
| parent | 5144c534d16529bc469396211131e8935589f833 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'drivers/media/video/pwc/pwc-if.c')
| -rw-r--r-- | drivers/media/video/pwc/pwc-if.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index e62beb4efdb4..f3dc89da4c4e 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | #include <linux/module.h> | 62 | #include <linux/module.h> |
| 63 | #include <linux/poll.h> | 63 | #include <linux/poll.h> |
| 64 | #include <linux/slab.h> | 64 | #include <linux/slab.h> |
| 65 | #include <linux/smp_lock.h> | ||
| 66 | #ifdef CONFIG_USB_PWC_INPUT_EVDEV | 65 | #ifdef CONFIG_USB_PWC_INPUT_EVDEV |
| 67 | #include <linux/usb/input.h> | 66 | #include <linux/usb/input.h> |
| 68 | #endif | 67 | #endif |