summaryrefslogtreecommitdiff
path: root/include/media/videobuf-dvb.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-14 20:01:56 +0300
committerTakashi Iwai <tiwai@suse.de>2009-12-14 20:01:56 +0300
commitb89371621e5bedc84498ced2c5c33976bd1b2f64 (patch)
treeb309919239586e25617a17785b827577b1abb6b5 /include/media/videobuf-dvb.h
parent63978ab3e3e963db28093b53bb4598f2702e1ad7 (diff)
parent74c2b45b714e49b427584b4bd8f44f1a24d82d9c (diff)
downloadlinux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.xz
Merge branch 'next/isa' into topic/misc
Diffstat (limited to 'include/media/videobuf-dvb.h')
-rw-r--r--include/media/videobuf-dvb.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h
index 6ba4f1271d23..07cf4b9d0a65 100644
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -42,7 +42,9 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
void *adapter_priv,
struct device *device,
short *adapter_nr,
- int mfe_shared);
+ int mfe_shared,
+ int (*fe_ioctl_override)(struct dvb_frontend *,
+ unsigned int, void *, unsigned int));
void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f);