diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:26:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:26:05 -0800 |
| commit | e861d890c02c1105d0c82e3904c67f0386352fe2 (patch) | |
| tree | 0ccd4eb94b7360fa980b8a5028a6bdf8f82c8da5 /drivers/media/dvb-frontends/Kconfig | |
| parent | acb57b7548cb84680f4f5263e63736ced8c2e257 (diff) | |
| parent | 7a0786c19d65bd4502b4a53aec9ef75e18192a00 (diff) | |
Merge branch 'media-fixes' (patches from Mauro)
Merge media fixes from Mauro Carvalho Chehab:
"This contains two patches fixing problems with my patch series meant
to make USB drivers to work again after the DMA on stack changes.
The last patch on this series is actually not related to DMA on stack.
It solves a longstanding bug affecting module unload, causing
module_put() to be called twice. It was reported by the user who
reported and tested the issues with the gp8psk driver with the DMA
fixup patches. As we're late at -rc cycle, maybe you prefer to not
apply it right now. If this is the case, I'll add to the pile of
patches for 4.10.
Exceptionally this time, I'm sending the patches via e-mail, because
I'm on another trip, and won't be able to use the usual procedure
until Monday. Also, it is only three patches, and you followed already
the discussions about the first one"
* emailed patches from Mauro Carvalho Chehab <mchehab@osg.samsung.com>:
gp8psk: Fix DVB frontend attach
gp8psk: fix gp8psk_usb_in_op() logic
dvb-usb: move data_mutex to struct dvb_usb_device
Diffstat (limited to 'drivers/media/dvb-frontends/Kconfig')
| -rw-r--r-- | drivers/media/dvb-frontends/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index 012225587c25..b71b747ee0ba 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -513,6 +513,11 @@ config DVB_AS102_FE depends on DVB_CORE default DVB_AS102 +config DVB_GP8PSK_FE + tristate + depends on DVB_CORE + default DVB_USB_GP8PSK + comment "DVB-C (cable) frontends" depends on DVB_CORE |