projects
/
cascardo
/
linux.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/ide-2.6
[cascardo/linux.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dmxdev.c
diff --git
a/drivers/media/dvb/dvb-core/dmxdev.c
b/drivers/media/dvb/dvb-core/dmxdev.c
index
3750ff4
..
c37790a
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dmxdev.c
+++ b/
drivers/media/dvb/dvb-core/dmxdev.c
@@
-20,6
+20,7
@@
*
*/
*
*/
+#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@
-1203,7
+1204,7
@@
static unsigned int dvb_dvr_poll(struct file *file, poll_table *wait)
return mask;
}
return mask;
}
-static struct file_operations dvb_dvr_fops = {
+static
const
struct file_operations dvb_dvr_fops = {
.owner = THIS_MODULE,
.read = dvb_dvr_read,
.write = dvb_dvr_write,
.owner = THIS_MODULE,
.read = dvb_dvr_read,
.write = dvb_dvr_write,