diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /include/media/videobuf-dvb.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'include/media/videobuf-dvb.h')
| -rw-r--r-- | include/media/videobuf-dvb.h | 4 |
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, | |||
| 42 | void *adapter_priv, | 42 | void *adapter_priv, |
| 43 | struct device *device, | 43 | struct device *device, |
| 44 | short *adapter_nr, | 44 | short *adapter_nr, |
| 45 | int mfe_shared); | 45 | int mfe_shared, |
| 46 | int (*fe_ioctl_override)(struct dvb_frontend *, | ||
| 47 | unsigned int, void *, unsigned int)); | ||
| 46 | 48 | ||
| 47 | void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f); | 49 | void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f); |
| 48 | 50 | ||