diff --git a/[refs] b/[refs] index 58b09d017b86..bafe6f1499f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dfd071271bb237d16d8088287bf52a2684cb3ca +refs/heads/master: 8d31bac155d0d891a2380d5b683e6b285cc23e34 diff --git a/trunk/drivers/staging/cxd2099/Kconfig b/trunk/drivers/staging/cxd2099/Kconfig index 9d638c30735d..b48aefddc84c 100644 --- a/trunk/drivers/staging/cxd2099/Kconfig +++ b/trunk/drivers/staging/cxd2099/Kconfig @@ -1,9 +1,10 @@ config DVB_CXD2099 - tristate "CXD2099AR Common Interface driver" - depends on DVB_CORE && PCI && I2C && DVB_NGENE - ---help--- - Support for the CI module found on cineS2 DVB-S2, supported by - the Micronas PCIe device driver (ngene). + tristate "CXD2099AR Common Interface driver" + depends on DVB_CORE && PCI && I2C + ---help--- + Support for the CI module found on cards based on + - Micronas ngene PCIe bridge: cineS2 etc. + - Digital Devices PCIe bridge: Octopus series For now, data is passed through '/dev/dvb/adapterX/sec0': - Encrypted data must be written to 'sec0'.