diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 10:56:47 (GMT) |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 10:56:47 (GMT) |
| commit | 6ea7e3873e52902af9ee8c0837450fdb69d54140 (patch) | |
| tree | b291dad174446387a166763cfbf3dd351148ecbe /include/media/videobuf2-dvb.h | |
| parent | 5ddfe0858ea7848c5d4efe3f4319e7543522e0ee (diff) | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | linux-6ea7e3873e52902af9ee8c0837450fdb69d54140.tar.xz | |
Merge branch 'fixes-base' into fixes
Diffstat (limited to 'include/media/videobuf2-dvb.h')
| -rw-r--r-- | include/media/videobuf2-dvb.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/media/videobuf2-dvb.h b/include/media/videobuf2-dvb.h index 5b64c9e..87b5590 100644 --- a/include/media/videobuf2-dvb.h +++ b/include/media/videobuf2-dvb.h @@ -8,6 +8,10 @@ #include <dvb_frontend.h> #include <media/videobuf2-v4l2.h> + +/* We don't actually need to include media-device.h here */ +struct media_device; + /* * TODO: This header file should be replaced with videobuf2-core.h * Currently, vb2_thread is not a stuff of videobuf2-core, @@ -50,6 +54,7 @@ int vb2_dvb_register_bus(struct vb2_dvb_frontends *f, struct module *module, void *adapter_priv, struct device *device, + struct media_device *mdev, short *adapter_nr, int mfe_shared); |