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 git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-video.c
diff --git
a/drivers/media/video/cx88/cx88-video.c
b/drivers/media/video/cx88/cx88-video.c
index fbce1d50578bf39ca880f053005931e517798b71..b94ef8ab28c1503f4602565bb7b3c24356614734 100644
(file)
--- a/
drivers/media/video/cx88/cx88-video.c
+++ b/
drivers/media/video/cx88/cx88-video.c
@@
-1,4
+1,3
@@
-
/*
*
* device driver for Conexant 2388x based TV cards
@@
-34,6
+33,7
@@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
#include <linux/delay.h>
#include <linux/kthread.h>
#include <asm/div64.h>