diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 14:32:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 14:32:00 -0300 |
| commit | 1ae05bf0de9d8d9f666aaf90e979b493531a8d22 (patch) | |
| tree | a201632fab0519830f0bdf0d6adc7fc4c8d9e90b /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | |
| parent | 5d7bbbc2deda111b6ff82eb3bad4b576eac94d3d (diff) | |
| parent | fdbc4f16f905bdbd39641f297b2b63cde17f17a5 (diff) | |
| download | mediapointer-dvb-s2-1ae05bf0de9d8d9f666aaf90e979b493531a8d22.tar.gz mediapointer-dvb-s2-1ae05bf0de9d8d9f666aaf90e979b493531a8d22.tar.bz2 | |
Merge from hverkuil routing tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c index 69864782b..7d137a25f 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c @@ -24,7 +24,6 @@ #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" #include <linux/videodev.h> -#include <media/audiochip.h> static void set_standard(struct pvr2_hdw *hdw) |