git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.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
..
c7f6f64
100644
(file)
--- a/
drivers/media/video/zoran_procfs.c
+++ b/
drivers/media/video/zoran_procfs.c
@@
-27,7
+27,6
@@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@
-43,6
+42,7
@@
#include <linux/seq_file.h>
#include <linux/ctype.h>
#include <linux/seq_file.h>
#include <linux/ctype.h>
+#include <linux/poll.h>
#include <asm/io.h>
#include "videocodec.h"
#include <asm/io.h>
#include "videocodec.h"