aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2017-08-30 04:47:21 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-09-23 14:59:24 -0400
commit561b29e4ec8d0aac7e094f70d649ee4abccdda03 (patch)
treeff4b598e3f6774b1863389bc43092dd9c262d6e2
parent201c799637f293f8c2a9e4c91de1987bc8b9075c (diff)
media: fix media Kconfig help syntax issues
The help text should be indented by at least two spaces after the 'help' separator. This is both good practice and the media_build system for building media drivers makes this assumption. I went through all Kconfigs under drivers/media and fixed any bad help sections. This makes it conform to the common practice and should fix problems with 'make menuconfig' when using media_build. This is due to a "WARNING" message that media_build can insert in the Kconfig and that assumes the help text is indented by at least two spaces. If not, then the Kconfig becomes invalid and 'make menuconfig' fails. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reported-by: Thomas Kaiser <linux-dvb@kaiser-linux.li> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/dvb-frontends/Kconfig6
-rw-r--r--drivers/media/pci/b2c2/Kconfig4
-rw-r--r--drivers/media/pci/netup_unidvb/Kconfig12
-rw-r--r--drivers/media/platform/exynos4-is/Kconfig2
-rw-r--r--drivers/media/radio/wl128x/Kconfig10
-rw-r--r--drivers/media/usb/b2c2/Kconfig6
-rw-r--r--drivers/media/usb/gspca/Kconfig16
-rw-r--r--drivers/media/usb/pvrusb2/Kconfig1
8 files changed, 28 insertions, 29 deletions
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 2631d0e0a024..d17722eb4456 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -173,7 +173,7 @@ config DVB_STB6000
173 tristate "ST STB6000 silicon tuner" 173 tristate "ST STB6000 silicon tuner"
174 depends on DVB_CORE && I2C 174 depends on DVB_CORE && I2C
175 default m if !MEDIA_SUBDRV_AUTOSELECT 175 default m if !MEDIA_SUBDRV_AUTOSELECT
176 help 176 help
177 A DVB-S silicon tuner module. Say Y when you want to support this tuner. 177 A DVB-S silicon tuner module. Say Y when you want to support this tuner.
178 178
179config DVB_STV0299 179config DVB_STV0299
@@ -187,7 +187,7 @@ config DVB_STV6110
187 tristate "ST STV6110 silicon tuner" 187 tristate "ST STV6110 silicon tuner"
188 depends on DVB_CORE && I2C 188 depends on DVB_CORE && I2C
189 default m if !MEDIA_SUBDRV_AUTOSELECT 189 default m if !MEDIA_SUBDRV_AUTOSELECT
190 help 190 help
191 A DVB-S silicon tuner module. Say Y when you want to support this tuner. 191 A DVB-S silicon tuner module. Say Y when you want to support this tuner.
192 192
193config DVB_STV0900 193config DVB_STV0900
@@ -902,7 +902,7 @@ config DVB_HELENE
902 depends on DVB_CORE && I2C 902 depends on DVB_CORE && I2C
903 default m if !MEDIA_SUBDRV_AUTOSELECT 903 default m if !MEDIA_SUBDRV_AUTOSELECT
904 help 904 help
905 Say Y when you want to support this frontend. 905 Say Y when you want to support this frontend.
906 906
907comment "Tools to develop new frontends" 907comment "Tools to develop new frontends"
908 908
diff --git a/drivers/media/pci/b2c2/Kconfig b/drivers/media/pci/b2c2/Kconfig
index 58761a21caa0..7b818d445f39 100644
--- a/drivers/media/pci/b2c2/Kconfig
+++ b/drivers/media/pci/b2c2/Kconfig
@@ -11,5 +11,5 @@ config DVB_B2C2_FLEXCOP_PCI_DEBUG
11 depends on DVB_B2C2_FLEXCOP_PCI 11 depends on DVB_B2C2_FLEXCOP_PCI
12 select DVB_B2C2_FLEXCOP_DEBUG 12 select DVB_B2C2_FLEXCOP_DEBUG
13 help 13 help
14 Say Y if you want to enable the module option to control debug messages 14 Say Y if you want to enable the module option to control debug messages
15 of all B2C2 FlexCop drivers. 15 of all B2C2 FlexCop drivers.
diff --git a/drivers/media/pci/netup_unidvb/Kconfig b/drivers/media/pci/netup_unidvb/Kconfig
index 0ad37714c7fd..b663154d0cc4 100644
--- a/drivers/media/pci/netup_unidvb/Kconfig
+++ b/drivers/media/pci/netup_unidvb/Kconfig
@@ -1,8 +1,8 @@
1config DVB_NETUP_UNIDVB 1config DVB_NETUP_UNIDVB
2 tristate "NetUP Universal DVB card support" 2 tristate "NetUP Universal DVB card support"
3 depends on DVB_CORE && VIDEO_DEV && PCI && I2C && SPI_MASTER 3 depends on DVB_CORE && VIDEO_DEV && PCI && I2C && SPI_MASTER
4 select VIDEOBUF2_DVB 4 select VIDEOBUF2_DVB
5 select VIDEOBUF2_VMALLOC 5 select VIDEOBUF2_VMALLOC
6 select DVB_HORUS3A if MEDIA_SUBDRV_AUTOSELECT 6 select DVB_HORUS3A if MEDIA_SUBDRV_AUTOSELECT
7 select DVB_ASCOT2E if MEDIA_SUBDRV_AUTOSELECT 7 select DVB_ASCOT2E if MEDIA_SUBDRV_AUTOSELECT
8 select DVB_HELENE if MEDIA_SUBDRV_AUTOSELECT 8 select DVB_HELENE if MEDIA_SUBDRV_AUTOSELECT
@@ -10,8 +10,8 @@ config DVB_NETUP_UNIDVB
10 select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT 10 select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT
11 ---help--- 11 ---help---
12 Support for NetUP PCI express Universal DVB card. 12 Support for NetUP PCI express Universal DVB card.
13 help 13
14 Say Y when you want to support NetUP Dual Universal DVB card 14 Say Y when you want to support NetUP Dual Universal DVB card.
15 Card can receive two independent streams in following standards: 15 Card can receive two independent streams in following standards:
16 DVB-S/S2, T/T2, C/C2 16 DVB-S/S2, T/T2, C/C2
17 Two CI slots available for CAM modules. 17 Two CI slots available for CAM modules.
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
index c480efb755f5..46a7d242a1a5 100644
--- a/drivers/media/platform/exynos4-is/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -76,7 +76,7 @@ config VIDEO_EXYNOS4_ISP_DMA_CAPTURE
76 depends on VIDEO_EXYNOS4_FIMC_IS 76 depends on VIDEO_EXYNOS4_FIMC_IS
77 select VIDEO_EXYNOS4_IS_COMMON 77 select VIDEO_EXYNOS4_IS_COMMON
78 default y 78 default y
79 help 79 help
80 This option enables an additional video device node exposing a V4L2 80 This option enables an additional video device node exposing a V4L2
81 video capture interface for the FIMC-IS ISP raw (Bayer) capture DMA. 81 video capture interface for the FIMC-IS ISP raw (Bayer) capture DMA.
82 82
diff --git a/drivers/media/radio/wl128x/Kconfig b/drivers/media/radio/wl128x/Kconfig
index c9e349b169c4..2add222ea346 100644
--- a/drivers/media/radio/wl128x/Kconfig
+++ b/drivers/media/radio/wl128x/Kconfig
@@ -7,11 +7,11 @@ config RADIO_WL128X
7 depends on VIDEO_V4L2 && RFKILL && TTY && TI_ST 7 depends on VIDEO_V4L2 && RFKILL && TTY && TI_ST
8 depends on GPIOLIB || COMPILE_TEST 8 depends on GPIOLIB || COMPILE_TEST
9 help 9 help
10 Choose Y here if you have this FM radio chip. 10 Choose Y here if you have this FM radio chip.
11 11
12 In order to control your radio card, you will need to use programs 12 In order to control your radio card, you will need to use programs
13 that are compatible with the Video For Linux 2 API. Information on 13 that are compatible with the Video For Linux 2 API. Information on
14 this API and pointers to "v4l2" programs may be found at 14 this API and pointers to "v4l2" programs may be found at
15 <file:Documentation/video4linux/API.html>. 15 <file:Documentation/video4linux/API.html>.
16 16
17endmenu 17endmenu
diff --git a/drivers/media/usb/b2c2/Kconfig b/drivers/media/usb/b2c2/Kconfig
index 17d35833980c..a620ae42dfc8 100644
--- a/drivers/media/usb/b2c2/Kconfig
+++ b/drivers/media/usb/b2c2/Kconfig
@@ -10,6 +10,6 @@ config DVB_B2C2_FLEXCOP_USB_DEBUG
10 bool "Enable debug for the B2C2 FlexCop drivers" 10 bool "Enable debug for the B2C2 FlexCop drivers"
11 depends on DVB_B2C2_FLEXCOP_USB 11 depends on DVB_B2C2_FLEXCOP_USB
12 select DVB_B2C2_FLEXCOP_DEBUG 12 select DVB_B2C2_FLEXCOP_DEBUG
13 help 13 help
14 Say Y if you want to enable the module option to control debug messages 14 Say Y if you want to enable the module option to control debug messages
15 of all B2C2 FlexCop drivers. 15 of all B2C2 FlexCop drivers.
diff --git a/drivers/media/usb/gspca/Kconfig b/drivers/media/usb/gspca/Kconfig
index 3fd94fe7e1eb..d214a21acff7 100644
--- a/drivers/media/usb/gspca/Kconfig
+++ b/drivers/media/usb/gspca/Kconfig
@@ -204,11 +204,11 @@ config USB_GSPCA_SE401
204 tristate "SE401 USB Camera Driver" 204 tristate "SE401 USB Camera Driver"
205 depends on VIDEO_V4L2 && USB_GSPCA 205 depends on VIDEO_V4L2 && USB_GSPCA
206 help 206 help
207 Say Y here if you want support for cameras based on the 207 Say Y here if you want support for cameras based on the
208 Endpoints (formerly known as AOX) se401 chip. 208 Endpoints (formerly known as AOX) se401 chip.
209 209
210 To compile this driver as a module, choose M here: the 210 To compile this driver as a module, choose M here: the
211 module will be called gspca_se401. 211 module will be called gspca_se401.
212 212
213config USB_GSPCA_SN9C2028 213config USB_GSPCA_SN9C2028
214 tristate "SONIX Dual-Mode USB Camera Driver" 214 tristate "SONIX Dual-Mode USB Camera Driver"
@@ -224,11 +224,11 @@ config USB_GSPCA_SN9C20X
224 tristate "SN9C20X USB Camera Driver" 224 tristate "SN9C20X USB Camera Driver"
225 depends on VIDEO_V4L2 && USB_GSPCA 225 depends on VIDEO_V4L2 && USB_GSPCA
226 help 226 help
227 Say Y here if you want support for cameras based on the 227 Say Y here if you want support for cameras based on the
228 sn9c20x chips (SN9C201 and SN9C202). 228 sn9c20x chips (SN9C201 and SN9C202).
229 229
230 To compile this driver as a module, choose M here: the 230 To compile this driver as a module, choose M here: the
231 module will be called gspca_sn9c20x. 231 module will be called gspca_sn9c20x.
232 232
233config USB_GSPCA_SONIXB 233config USB_GSPCA_SONIXB
234 tristate "SONIX Bayer USB Camera Driver" 234 tristate "SONIX Bayer USB Camera Driver"
diff --git a/drivers/media/usb/pvrusb2/Kconfig b/drivers/media/usb/pvrusb2/Kconfig
index 60a2604e4cb3..1ad913fc30bf 100644
--- a/drivers/media/usb/pvrusb2/Kconfig
+++ b/drivers/media/usb/pvrusb2/Kconfig
@@ -44,7 +44,6 @@ config VIDEO_PVRUSB2_DVB
44 select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT 44 select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT
45 select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT 45 select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT
46 ---help--- 46 ---help---
47
48 This option enables a DVB interface for the pvrusb2 driver. 47 This option enables a DVB interface for the pvrusb2 driver.
49 If your device does not support digital television, this 48 If your device does not support digital television, this
50 feature will have no affect on the driver's operation. 49 feature will have no affect on the driver's operation.