diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:44:30 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:44:30 -0300 |
commit | b42ffafbaf363a50a8b7188a53d9c391c7ff7468 (patch) | |
tree | 392683dbf0e3bf34a48bd9bc1ab2b40d5b452fc2 /linux/drivers/media/video/usbvision | |
parent | 253922fc720f48e98e6bc9030b5c712044ab83fc (diff) | |
parent | dbe96ea057cb7cf8050f22c934df078560d88c65 (diff) | |
download | mediapointer-dvb-s2-b42ffafbaf363a50a8b7188a53d9c391c7ff7468.tar.gz mediapointer-dvb-s2-b42ffafbaf363a50a8b7188a53d9c391c7ff7468.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fixes
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvision')
-rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-core.c | 1 | ||||
-rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-video.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c index bf464540c..4c391727e 100644 --- a/linux/drivers/media/video/usbvision/usbvision-core.c +++ b/linux/drivers/media/video/usbvision/usbvision-core.c @@ -43,7 +43,6 @@ #include <media/saa7115.h> #include <media/v4l2-common.h> #include <media/tuner.h> -#include <media/audiochip.h> #include <linux/workqueue.h> diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index 56cd685d3..5984c7562 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -67,7 +67,6 @@ #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/tuner.h> -#include <media/audiochip.h> #include <linux/workqueue.h> |