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/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zoran_procfs.c
diff --git
a/drivers/media/video/zoran_procfs.c
b/drivers/media/video/zoran_procfs.c
index
a00fae9
..
f4ffe79
100644
(file)
--- a/
drivers/media/video/zoran_procfs.c
+++ b/
drivers/media/video/zoran_procfs.c
@@
-43,6
+43,7
@@
#include <linux/seq_file.h>
#include <linux/ctype.h>
+#include <linux/poll.h>
#include <asm/io.h>
#include "videocodec.h"