Merge branch 'CAIF-Kconfig-fixes' (bc389189) · Commits · 戴 / test

drivers/net/caif/Kconfig

+12 −4

Original line number	Diff line number	Diff line
		@@ -3,7 +3,13 @@
		# CAIF physical drivers
		#

		comment "CAIF transport drivers"
		menuconfig CAIF_DRIVERS
		bool "CAIF transport drivers"
		depends on CAIF
		help
		Enable this to see CAIF physical drivers.

		if CAIF_DRIVERS

		config CAIF_TTY
		tristate "CAIF TTY transport driver"
		@@ -22,7 +28,7 @@ config CAIF_SPI_SLAVE
		The CAIF Link layer SPI Protocol driver for Slave SPI interface.
		This driver implements a platform driver to accommodate for a
		platform specific SPI device. A sample CAIF SPI Platform device is
		provided in Documentation/networking/caif/spi_porting.txt
		provided in <file:Documentation/networking/caif/spi_porting.txt>.

		config CAIF_SPI_SYNC
		bool "Next command and length in start of frame"
		@@ -38,7 +44,7 @@ config CAIF_HSI
		depends on CAIF
		default n
		---help---
		The caif low level driver for CAIF over HSI.
		The CAIF low level driver for CAIF over HSI.
		Be aware that if you enable this then you also need to
		enable a low-level HSI driver.

		@@ -50,8 +56,10 @@ config CAIF_VIRTIO
		select GENERIC_ALLOCATOR
		default n
		---help---
		The caif driver for CAIF over Virtio.
		The CAIF driver for CAIF over Virtio.

		if CAIF_VIRTIO
		source "drivers/vhost/Kconfig.vringh"
		endif

		endif # CAIF_DRIVERS

+5 −5

Original line number	Diff line number	Diff line
		@@ -13,11 +13,11 @@ menuconfig CAIF
		with its modems. It is accessed from user space as sockets (PF_CAIF).

		Say Y (or M) here if you build for a phone product (e.g. Android or
		MeeGo ) that uses CAIF as transport, if unsure say N.
		MeeGo) that uses CAIF as transport. If unsure say N.

		If you select to build it as module then CAIF_NETDEV also needs to be
		built as modules. You will also need to say yes to any CAIF physical
		devices that your platform requires.
		built as a module. You will also need to say Y (or M) to any CAIF
		physical devices that your platform requires.

		See Documentation/networking/caif for a further explanation on how to
		use and configure CAIF.
		@@ -37,7 +37,7 @@ config CAIF_NETDEV
		default CAIF
		---help---
		Say Y if you will be using a CAIF based GPRS network device.
		This can be either built-in or a loadable module,
		This can be either built-in or a loadable module.
		If you select to build it as a built-in then the main CAIF device must
		also be a built-in.
		If unsure say Y.
		@@ -48,7 +48,7 @@ config CAIF_USB
		default n
		---help---
		Say Y if you are using CAIF over USB CDC NCM.
		This can be either built-in or a loadable module,
		This can be either built-in or a loadable module.
		If you select to build it as a built-in then the main CAIF device must
		also be a built-in.
		If unsure say N.