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/radio/radio-cadet.c | |
parent | 682e852e2638ed0aff84aa51181c9e5d2f939562 (diff) | |
parent | cec418346e5a411e907293aba7cc21ac53c95834 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/radio/radio-cadet.c')
-rw-r--r-- | drivers/media/radio/radio-cadet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 9b0406318f2d..f1b5ac81e9d2 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
@@ -490,6 +490,7 @@ static struct file_operations cadet_fops = { | |||
490 | .release = cadet_release, | 490 | .release = cadet_release, |
491 | .read = cadet_read, | 491 | .read = cadet_read, |
492 | .ioctl = cadet_ioctl, | 492 | .ioctl = cadet_ioctl, |
493 | .compat_ioctl = v4l_compat_ioctl32, | ||
493 | .llseek = no_llseek, | 494 | .llseek = no_llseek, |
494 | }; | 495 | }; |
495 | 496 | ||