diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-15 23:38:31 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-15 23:38:31 -0300 |
commit | 09face28b78569cdcc7c6ab30a96e8548c85f319 (patch) | |
tree | 012542b31853970a3efda0ece7a3c1e697e95ffd /linux/drivers/media/video/vivi.c | |
parent | ad8c1665001c90893f44e6cb1d22a8309d16e16b (diff) | |
parent | e4a9fb69a7c69cc46bd393234766c32403ad8f56 (diff) | |
download | mediapointer-dvb-s2-09face28b78569cdcc7c6ab30a96e8548c85f319.tar.gz mediapointer-dvb-s2-09face28b78569cdcc7c6ab30a96e8548c85f319.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/vivi.c')
-rw-r--r-- | linux/drivers/media/video/vivi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c index 7da5487f2..21fbaa009 100644 --- a/linux/drivers/media/video/vivi.c +++ b/linux/drivers/media/video/vivi.c @@ -26,7 +26,6 @@ #include <linux/random.h> #include <linux/version.h> #include "compat.h" - #include <linux/videodev2.h> #include <linux/dma-mapping.h> #ifdef CONFIG_VIDEO_V4L1_COMPAT |