diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 18:30:28 (GMT) |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 18:30:28 (GMT) |
commit | b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f (patch) | |
tree | f6ca7059e9c1bc1aac9a6741316f8e07ba349f7f /drivers/media/video/s2255drv.c | |
parent | 24f3f6b5eff92608a62449e33bfac0eed1447d02 (diff) | |
parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
download | linux-fsl-qoriq-b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/media/video/s2255drv.c')
-rw-r--r-- | drivers/media/video/s2255drv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index f5a46c4..a845753 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c @@ -49,7 +49,6 @@ #include <linux/videodev2.h> #include <linux/version.h> #include <linux/mm.h> -#include <linux/smp_lock.h> #include <media/videobuf-vmalloc.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h> |