diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
| commit | f17578decc40df8fceff82b106582e30bdfb3189 (patch) | |
| tree | 911a435a2094ac03ae649f020237674224e4124a /drivers/media/video/stradis.c | |
| parent | 682e852e2638ed0aff84aa51181c9e5d2f939562 (diff) | |
| parent | cec418346e5a411e907293aba7cc21ac53c95834 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/stradis.c')
| -rw-r--r-- | drivers/media/video/stradis.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index d4497dbae05c..6ee54a45411f 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
| @@ -1974,6 +1974,7 @@ static struct file_operations saa_fops = | |||
| 1974 | .open = saa_open, | 1974 | .open = saa_open, |
| 1975 | .release = saa_release, | 1975 | .release = saa_release, |
| 1976 | .ioctl = saa_ioctl, | 1976 | .ioctl = saa_ioctl, |
| 1977 | .compat_ioctl = v4l_compat_ioctl32, | ||
| 1977 | .read = saa_read, | 1978 | .read = saa_read, |
| 1978 | .llseek = no_llseek, | 1979 | .llseek = no_llseek, |
| 1979 | .write = saa_write, | 1980 | .write = saa_write, |