diff options
author | Mark Brown | 2019-05-20 12:54:21 +0200 |
---|---|---|
committer | Mark Brown | 2019-05-20 12:54:21 +0200 |
commit | eceb995e04b74204c73f9dd0ccb19061d5082063 (patch) | |
tree | 265d09722dbaaa4a4c97619d763a40d2be954f16 /drivers/media/pci/saa7134/Kconfig | |
parent | spi: tegra114: add support for TX and RX trimmers (diff) | |
parent | Linux 5.2-rc1 (diff) | |
download | kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.gz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.xz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.zip |
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'drivers/media/pci/saa7134/Kconfig')
-rw-r--r-- | drivers/media/pci/saa7134/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/pci/saa7134/Kconfig b/drivers/media/pci/saa7134/Kconfig index b44e0d70907e..8b28783b3fcd 100644 --- a/drivers/media/pci/saa7134/Kconfig +++ b/drivers/media/pci/saa7134/Kconfig @@ -7,7 +7,7 @@ config VIDEO_SAA7134 select CRC32 select VIDEO_SAA6588 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_SAA6752HS if MEDIA_SUBDRV_AUTOSELECT - ---help--- + help This is a video4linux driver for Philips SAA713x based TV cards. @@ -18,7 +18,7 @@ config VIDEO_SAA7134_ALSA tristate "Philips SAA7134 DMA audio support" depends on VIDEO_SAA7134 && SND select SND_PCM - ---help--- + help This is a video4linux driver for direct (DMA) audio in Philips SAA713x based TV cards using ALSA @@ -31,7 +31,7 @@ config VIDEO_SAA7134_RC depends on VIDEO_SAA7134 depends on !(RC_CORE=m && VIDEO_SAA7134=y) default y - ---help--- + help Enables Remote Controller support on saa7134 driver. config VIDEO_SAA7134_DVB @@ -57,7 +57,7 @@ config VIDEO_SAA7134_DVB select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT select DVB_ZL10039 if MEDIA_SUBDRV_AUTOSELECT - ---help--- + help This adds support for DVB cards based on the Philips saa7134 chip. @@ -68,6 +68,6 @@ config VIDEO_SAA7134_GO7007 tristate "go7007 support for saa7134 based TV cards" depends on VIDEO_SAA7134 depends on VIDEO_GO7007 - ---help--- + help Enables saa7134 driver support for boards with go7007 MPEG encoder (WIS Voyager or compatible). |