diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-30 20:10:43 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-30 20:10:43 -0300 |
commit | 9a373df780905ef4e981bae11edccba07d94e305 (patch) | |
tree | 5339c90619daa9375c5ca37023b40eea1a8f932e /linux/drivers/media/video/v4l2-dev.c | |
parent | 49baec9371209e4c77da0321f577b9a33be0fe48 (diff) | |
parent | 74171fb0a60787bfd13f6a4a98450f0f5ed4d0dc (diff) | |
download | mediapointer-dvb-s2-9a373df780905ef4e981bae11edccba07d94e305.tar.gz mediapointer-dvb-s2-9a373df780905ef4e981bae11edccba07d94e305.tar.bz2 |
merge: http://kernellabs.com/hg/~mkrufky/cx23885
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-dev.c')
-rw-r--r-- | linux/drivers/media/video/v4l2-dev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index f7e128729..9969abb28 100644 --- a/linux/drivers/media/video/v4l2-dev.c +++ b/linux/drivers/media/video/v4l2-dev.c @@ -25,7 +25,6 @@ #include <linux/init.h> #include <linux/kmod.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/system.h> |