git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
bt8xx
/
bt832.c
diff --git
a/drivers/media/video/bt8xx/bt832.c
b/drivers/media/video/bt8xx/bt832.c
index f1309d94e96e8b0bf22e6287afdf87589c3d10b8..a51876137880b26babbd24b6ae153aa6d2f9fad1 100644
(file)
--- a/
drivers/media/video/bt8xx/bt832.c
+++ b/
drivers/media/video/bt8xx/bt832.c
@@
-30,7
+30,6
@@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/slab.h>
-#include <media/audiochip.h>
#include <media/v4l2-common.h>
#include "bttv.h"