diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-02 22:48:17 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-13 21:10:13 -0200 |
commit | 738a1b1e1355433ff29e20774df3d89355bbac9f (patch) | |
tree | 223386cee371b8ac643fe8d8e913b4d3175973d2 /drivers/media/dvb-core | |
parent | 8afd52ef92f8ff657965cef5f0da0a4bba04a361 (diff) | |
download | op-kernel-dev-738a1b1e1355433ff29e20774df3d89355bbac9f.zip op-kernel-dev-738a1b1e1355433ff29e20774df3d89355bbac9f.tar.gz |
[media] dvb_ca_en50221: add support for CA node at the media controller
Make the dvb core CA support aware of the media controller and
register the corresponding devices.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-core')
-rw-r--r-- | drivers/media/dvb-core/dvb_ca_en50221.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c index 0aac309..2bf28eb 100644 --- a/drivers/media/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb-core/dvb_ca_en50221.c @@ -1638,15 +1638,17 @@ static const struct file_operations dvb_ca_fops = { .llseek = noop_llseek, }; -static struct dvb_device dvbdev_ca = { +static const struct dvb_device dvbdev_ca = { .priv = NULL, .users = 1, .readers = 1, .writers = 1, +#if defined(CONFIG_MEDIA_CONTROLLER_DVB) + .name = "ca_en50221", +#endif .fops = &dvb_ca_fops, }; - /* ******************************************************************************** */ /* Initialisation/shutdown functions */ |