summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx25840/cx25840-audio.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-23 14:32:00 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-23 14:32:00 -0300
commit1ae05bf0de9d8d9f666aaf90e979b493531a8d22 (patch)
treea201632fab0519830f0bdf0d6adc7fc4c8d9e90b /linux/drivers/media/video/cx25840/cx25840-audio.c
parent5d7bbbc2deda111b6ff82eb3bad4b576eac94d3d (diff)
parentfdbc4f16f905bdbd39641f297b2b63cde17f17a5 (diff)
downloadmediapointer-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/cx25840/cx25840-audio.c')
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-audio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-audio.c b/linux/drivers/media/video/cx25840/cx25840-audio.c
index fff65716f..2b3ad34f0 100644
--- a/linux/drivers/media/video/cx25840/cx25840-audio.c
+++ b/linux/drivers/media/video/cx25840/cx25840-audio.c
@@ -19,7 +19,6 @@
#include <linux/videodev2.h>
#include <linux/i2c.h>
-#include <media/audiochip.h>
#include <media/v4l2-common.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#include "i2c-compat.h"