git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
bt8xx
/
bttv.h
diff --git
a/drivers/media/video/bt8xx/bttv.h
b/drivers/media/video/bt8xx/bttv.h
index
3ec2402
..
6fd2a8e
100644
(file)
--- a/
drivers/media/video/bt8xx/bttv.h
+++ b/
drivers/media/video/bt8xx/bttv.h
@@
-18,7
+18,6
@@
#include <linux/i2c.h>
#include <media/v4l2-device.h>
#include <media/ir-common.h>
-#include <media/ir-kbd-i2c.h>
#include <media/i2c-addr.h>
#include <media/tuner.h>