Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx25840 / cx25840-audio.c

diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c
index cb9a7981e4081bc9ac284b2ff26c47b6f84fdd23..a4540e858f213883fa5cfe8d40b3fdbc46e4611b 100644 (file)
--- a/drivers/media/video/cx25840/cx25840-audio.c
+++ b/drivers/media/video/cx25840/cx25840-audio.c
@@ -18,7 +18,6 @@
 
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
-#include <media/audiochip.h>
 #include <media/v4l2-common.h>
 
 #include "cx25840.h"