diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/media | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videodev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index 54f8b95717b0..96fe0ecae250 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c | |||
@@ -86,7 +86,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) | |||
86 | 86 | ||
87 | if (dvbdev && dvbdev->fops) { | 87 | if (dvbdev && dvbdev->fops) { |
88 | int err = 0; | 88 | int err = 0; |
89 | struct file_operations *old_fops; | 89 | const struct file_operations *old_fops; |
90 | 90 | ||
91 | file->private_data = dvbdev; | 91 | file->private_data = dvbdev; |
92 | old_fops = file->f_op; | 92 | old_fops = file->f_op; |
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 75e3d41382f2..5f87dd5f1d0b 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -97,7 +97,7 @@ static int video_open(struct inode *inode, struct file *file) | |||
97 | unsigned int minor = iminor(inode); | 97 | unsigned int minor = iminor(inode); |
98 | int err = 0; | 98 | int err = 0; |
99 | struct video_device *vfl; | 99 | struct video_device *vfl; |
100 | struct file_operations *old_fops; | 100 | const struct file_operations *old_fops; |
101 | 101 | ||
102 | if(minor>=VIDEO_NUM_DEVICES) | 102 | if(minor>=VIDEO_NUM_DEVICES) |
103 | return -ENODEV; | 103 | return -ENODEV; |