diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-06 00:53:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-06 01:20:46 -0500 |
| commit | 0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70 (patch) | |
| tree | 439c89ea3c87496c23e167148f2cdbefb6e82b30 /include/media/dmxdev.h | |
| parent | ef3f6c256f0b4711a3ef1489797b95820be5ab01 (diff) | |
| parent | ce380619fab99036f5e745c7a865b21c59f005f6 (diff) | |
| download | linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.tar.gz linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.tar.bz2 linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All of the conflicts were cases of overlapping changes.
In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/media/dmxdev.h')
| -rw-r--r-- | include/media/dmxdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/dmxdev.h b/include/media/dmxdev.h index 2f5cb2c7b6a7..baafa3b8aca4 100644 --- a/include/media/dmxdev.h +++ b/include/media/dmxdev.h @@ -163,6 +163,7 @@ struct dmxdev_filter { * @demux: pointer to &struct dmx_demux. * @filternum: number of filters. * @capabilities: demux capabilities as defined by &enum dmx_demux_caps. + * @may_do_mmap: flag used to indicate if the device may do mmap. * @exit: flag to indicate that the demux is being released. * @dvr_orig_fe: pointer to &struct dmx_frontend. * @dvr_buffer: embedded &struct dvb_ringbuffer for DVB output. @@ -180,6 +181,7 @@ struct dmxdev { int filternum; int capabilities; + unsigned int may_do_mmap:1; unsigned int exit:1; #define DMXDEV_CAP_DUPLEX 1 struct dmx_frontend *dvr_orig_fe; |