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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zoran
/
zoran_procfs.c
diff --git
a/drivers/media/video/zoran/zoran_procfs.c
b/drivers/media/video/zoran/zoran_procfs.c
index
870bc5a
..
f1423b7
100644
(file)
--- a/
drivers/media/video/zoran/zoran_procfs.c
+++ b/
drivers/media/video/zoran/zoran_procfs.c
@@
-36,7
+36,7
@@
#include <linux/pci.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/videodev.h>
+#include <linux/videodev
2
.h>
#include <linux/spinlock.h>
#include <linux/sem.h>
#include <linux/seq_file.h>