diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-01 01:38:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-01 01:38:01 -0300 |
| commit | 0a6ce90779f4a12f8e75009d19209a4ee48707d8 (patch) | |
| tree | 9a8f2fdd6293a1cf8e281789ab3ba7b2f92384b8 /linux/drivers/media/video/pwc | |
| parent | abed55d1925015d07d0afd92eb50a0b2df2eca27 (diff) | |
| parent | e523ddb42e0588210df880e0e32f0de801803e94 (diff) | |
| download | mediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.gz mediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.bz2 | |
merge: http://kernellabs.com/hg/~mkrufky/sms1xxx-unbreak
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-if.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c index 4087612ee..f695c6624 100644 --- a/linux/drivers/media/video/pwc/pwc-if.c +++ b/linux/drivers/media/video/pwc/pwc-if.c @@ -62,6 +62,7 @@ #include <linux/module.h> #include <linux/poll.h> #include <linux/slab.h> +#include <linux/smp_lock.h> #ifdef CONFIG_USB_PWC_INPUT_EVDEV #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) #include <linux/usb_input.h> diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h index 7a766eb35..12c869d71 100644 --- a/linux/drivers/media/video/pwc/pwc.h +++ b/linux/drivers/media/video/pwc/pwc.h @@ -29,7 +29,6 @@ #include <linux/usb.h> #include <linux/spinlock.h> #include <linux/wait.h> -#include <linux/smp_lock.h> #include <linux/version.h> #include <linux/mutex.h> #include <linux/mm.h> |