Commit b11a2783 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kconfig updates from Michal Marek:
 "Yann E Morin was supposed to take over kconfig maintainership, but
  this hasn't happened.  So I'm sending a few kconfig patches that I
  collected:

   - Fix for missing va_end in kconfig
   - merge_config.sh displays used if given too few arguments
   - s/boolean/bool/ in Kconfig files for consistency, with the plan to
     only support bool in the future"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: use va_end to match corresponding va_start
  merge_config.sh: Display usage if given too few arguments
  kconfig: use bool instead of boolean for type definition attributes
parents 77343343 b6a2ab2c

arch/mips/pmcs-msp71xx/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ config PMC_MSP7120_FPGA 
endchoice



config MSP_HAS_USB

	boolean

	bool

	depends on PMC_MSP



config MSP_ETH

	boolean

	bool

	select MSP_HAS_MAC

	depends on PMC_MSP



config MSP_HAS_MAC

	boolean

	bool

	depends on PMC_MSP

drivers/connector/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ menuconfig CONNECTOR 
if CONNECTOR



config PROC_EVENTS

	boolean "Report process events to userspace"

	bool "Report process events to userspace"

	depends on CONNECTOR=y

	default y

	---help---

drivers/hwmon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ config SENSORS_W83795 
	  will be called w83795.



config SENSORS_W83795_FANCTRL

	boolean "Include automatic fan control support (DANGEROUS)"

	bool "Include automatic fan control support (DANGEROUS)"

	depends on SENSORS_W83795

	default n

	help

drivers/hwmon/pmbus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ config SENSORS_LTC2978 
	  be called ltc2978.



config SENSORS_LTC2978_REGULATOR

	boolean "Regulator support for LTC2978 and compatibles"

	bool "Regulator support for LTC2978 and compatibles"

	depends on SENSORS_LTC2978 && REGULATOR

	help

	  If you say yes here you get regulator support for Linear

drivers/i2c/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ config ACPI_I2C_OPREGION 
if I2C



config I2C_BOARDINFO

	boolean

	bool

	default y



config I2C_COMPAT

	boolean "Enable compatibility bits for old user-space"

	bool "Enable compatibility bits for old user-space"

	default y

	help

	  Say Y here if you intend to run lm-sensors 3.1.1 or older, or any

CRA Git | Maintained and supported by SUSTech CRA and CCSE