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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx231xx
/
cx231xx.h
diff --git
a/drivers/media/video/cx231xx/cx231xx.h
b/drivers/media/video/cx231xx/cx231xx.h
index
17d4d1a
..
38d4171
100644
(file)
--- a/
drivers/media/video/cx231xx/cx231xx.h
+++ b/
drivers/media/video/cx231xx/cx231xx.h
@@
-32,7
+32,7
@@
#include <media/videobuf-vmalloc.h>
#include <media/v4l2-device.h>
-#include <media/ir-
kbd-i2c
.h>
+#include <media/ir-
core
.h>
#if defined(CONFIG_VIDEO_CX231XX_DVB) || \
defined(CONFIG_VIDEO_CX231XX_DVB_MODULE)
#include <media/videobuf-dvb.h>