Skip to content

L
linux
Commit b11a2783 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 99 deletions
arch/mips/pmcs-msp71xx/Kconfig
View file @ b11a2783
...@@ -36,14 +36,14 @@ config PMC_MSP7120_FPGA ...@@ -36,14 +36,14 @@ config PMC_MSP7120_FPGA
endchoice endchoice
config MSP_HAS_USB config MSP_HAS_USB
boolean bool
depends on PMC_MSP depends on PMC_MSP
config MSP_ETH config MSP_ETH
boolean bool
select MSP_HAS_MAC select MSP_HAS_MAC
depends on PMC_MSP depends on PMC_MSP
config MSP_HAS_MAC config MSP_HAS_MAC
boolean bool
depends on PMC_MSP depends on PMC_MSP
drivers/connector/Kconfig
View file @ b11a2783
...@@ -12,7 +12,7 @@ menuconfig CONNECTOR ...@@ -12,7 +12,7 @@ menuconfig CONNECTOR
if CONNECTOR if CONNECTOR
config PROC_EVENTS config PROC_EVENTS
boolean "Report process events to userspace" bool "Report process events to userspace"
depends on CONNECTOR=y depends on CONNECTOR=y
default y default y
---help--- ---help---
......
drivers/hwmon/Kconfig
View file @ b11a2783
...@@ -1606,7 +1606,7 @@ config SENSORS_W83795 ...@@ -1606,7 +1606,7 @@ config SENSORS_W83795
will be called w83795. will be called w83795.
config SENSORS_W83795_FANCTRL config SENSORS_W83795_FANCTRL
boolean "Include automatic fan control support (DANGEROUS)" bool "Include automatic fan control support (DANGEROUS)"
depends on SENSORS_W83795 depends on SENSORS_W83795
default n default n
help help
......
drivers/hwmon/pmbus/Kconfig
View file @ b11a2783
...@@ -57,7 +57,7 @@ config SENSORS_LTC2978 ...@@ -57,7 +57,7 @@ config SENSORS_LTC2978
be called ltc2978. be called ltc2978.
config SENSORS_LTC2978_REGULATOR config SENSORS_LTC2978_REGULATOR
boolean "Regulator support for LTC2978 and compatibles" bool "Regulator support for LTC2978 and compatibles"
depends on SENSORS_LTC2978 && REGULATOR depends on SENSORS_LTC2978 && REGULATOR
help help
If you say yes here you get regulator support for Linear If you say yes here you get regulator support for Linear
......
drivers/i2c/Kconfig
View file @ b11a2783
...@@ -35,11 +35,11 @@ config ACPI_I2C_OPREGION ...@@ -35,11 +35,11 @@ config ACPI_I2C_OPREGION
if I2C if I2C
config I2C_BOARDINFO config I2C_BOARDINFO
boolean bool
default y default y
config I2C_COMPAT config I2C_COMPAT
boolean "Enable compatibility bits for old user-space" bool "Enable compatibility bits for old user-space"
default y default y
help help
Say Y here if you intend to run lm-sensors 3.1.1 or older, or any Say Y here if you intend to run lm-sensors 3.1.1 or older, or any
......
drivers/iio/Kconfig
View file @ b11a2783
...@@ -21,7 +21,7 @@ config IIO_BUFFER ...@@ -21,7 +21,7 @@ config IIO_BUFFER
if IIO_BUFFER if IIO_BUFFER
config IIO_BUFFER_CB config IIO_BUFFER_CB
boolean "IIO callback buffer used for push in-kernel interfaces" bool "IIO callback buffer used for push in-kernel interfaces"
help help
Should be selected by any drivers that do in-kernel push Should be selected by any drivers that do in-kernel push
usage. That is, those where the data is pushed to the consumer. usage. That is, those where the data is pushed to the consumer.
...@@ -43,7 +43,7 @@ config IIO_TRIGGERED_BUFFER ...@@ -43,7 +43,7 @@ config IIO_TRIGGERED_BUFFER
endif # IIO_BUFFER endif # IIO_BUFFER
config IIO_TRIGGER config IIO_TRIGGER
boolean "Enable triggered sampling support" bool "Enable triggered sampling support"
help help
Provides IIO core support for triggers. Currently these Provides IIO core support for triggers. Currently these
are used to initialize capture of samples to push into are used to initialize capture of samples to push into
......
drivers/isdn/hardware/mISDN/Kconfig
View file @ b11a2783
...@@ -24,7 +24,7 @@ config MISDN_HFCMULTI ...@@ -24,7 +24,7 @@ config MISDN_HFCMULTI
* HFC-E1 (E1 interface for 2Mbit ISDN) * HFC-E1 (E1 interface for 2Mbit ISDN)
config MISDN_HFCMULTI_8xx config MISDN_HFCMULTI_8xx
boolean "Support for XHFC embedded board in HFC multiport driver" bool "Support for XHFC embedded board in HFC multiport driver"
depends on MISDN depends on MISDN
depends on MISDN_HFCMULTI depends on MISDN_HFCMULTI
depends on 8xx depends on 8xx
......
drivers/md/Kconfig
View file @ b11a2783
...@@ -178,7 +178,7 @@ config MD_FAULTY ...@@ -178,7 +178,7 @@ config MD_FAULTY
source "drivers/md/bcache/Kconfig" source "drivers/md/bcache/Kconfig"
config BLK_DEV_DM_BUILTIN config BLK_DEV_DM_BUILTIN
boolean bool
config BLK_DEV_DM config BLK_DEV_DM
tristate "Device mapper support" tristate "Device mapper support"
...@@ -197,7 +197,7 @@ config BLK_DEV_DM ...@@ -197,7 +197,7 @@ config BLK_DEV_DM
If unsure, say N. If unsure, say N.
config DM_DEBUG config DM_DEBUG
boolean "Device mapper debugging support" bool "Device mapper debugging support"
depends on BLK_DEV_DM depends on BLK_DEV_DM
---help--- ---help---
Enable this for messages that may help debug device-mapper problems. Enable this for messages that may help debug device-mapper problems.
......
drivers/md/persistent-data/Kconfig
View file @ b11a2783
...@@ -8,7 +8,7 @@ config DM_PERSISTENT_DATA ...@@ -8,7 +8,7 @@ config DM_PERSISTENT_DATA
device-mapper targets such as the thin provisioning target. device-mapper targets such as the thin provisioning target.
config DM_DEBUG_BLOCK_STACK_TRACING config DM_DEBUG_BLOCK_STACK_TRACING
boolean "Keep stack trace of persistent data block lock holders" bool "Keep stack trace of persistent data block lock holders"
depends on STACKTRACE_SUPPORT && DM_PERSISTENT_DATA depends on STACKTRACE_SUPPORT && DM_PERSISTENT_DATA
select STACKTRACE select STACKTRACE
---help--- ---help---
......
drivers/net/ethernet/ti/Kconfig
View file @ b11a2783
...@@ -50,7 +50,7 @@ config TI_DAVINCI_CPDMA ...@@ -50,7 +50,7 @@ config TI_DAVINCI_CPDMA
will be called davinci_cpdma. This is recommended. will be called davinci_cpdma. This is recommended.
config TI_CPSW_PHY_SEL config TI_CPSW_PHY_SEL
boolean "TI CPSW Switch Phy sel Support" bool "TI CPSW Switch Phy sel Support"
depends on TI_CPSW depends on TI_CPSW
---help--- ---help---
This driver supports configuring of the phy mode connected to This driver supports configuring of the phy mode connected to
...@@ -77,7 +77,7 @@ config TI_CPSW ...@@ -77,7 +77,7 @@ config TI_CPSW
will be called cpsw. will be called cpsw.
config TI_CPTS config TI_CPTS
boolean "TI Common Platform Time Sync (CPTS) Support" bool "TI Common Platform Time Sync (CPTS) Support"
depends on TI_CPSW depends on TI_CPSW
select PTP_1588_CLOCK select PTP_1588_CLOCK
---help--- ---help---
......
drivers/net/usb/Kconfig
View file @ b11a2783
...@@ -397,14 +397,14 @@ config USB_NET_CDC_SUBSET ...@@ -397,14 +397,14 @@ config USB_NET_CDC_SUBSET
not generally have permanently assigned Ethernet addresses. not generally have permanently assigned Ethernet addresses.
config USB_ALI_M5632 config USB_ALI_M5632
boolean "ALi M5632 based 'USB 2.0 Data Link' cables" bool "ALi M5632 based 'USB 2.0 Data Link' cables"
depends on USB_NET_CDC_SUBSET depends on USB_NET_CDC_SUBSET
help help
Choose this option if you're using a host-to-host cable Choose this option if you're using a host-to-host cable
based on this design, which supports USB 2.0 high speed. based on this design, which supports USB 2.0 high speed.
config USB_AN2720 config USB_AN2720
boolean "AnchorChips 2720 based cables (Xircom PGUNET, ...)" bool "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
depends on USB_NET_CDC_SUBSET depends on USB_NET_CDC_SUBSET
help help
Choose this option if you're using a host-to-host cable Choose this option if you're using a host-to-host cable
...@@ -412,7 +412,7 @@ config USB_AN2720 ...@@ -412,7 +412,7 @@ config USB_AN2720
Cypress brand. Cypress brand.
config USB_BELKIN config USB_BELKIN
boolean "eTEK based host-to-host cables (Advance, Belkin, ...)" bool "eTEK based host-to-host cables (Advance, Belkin, ...)"
depends on USB_NET_CDC_SUBSET depends on USB_NET_CDC_SUBSET
default y default y
help help
...@@ -421,7 +421,7 @@ config USB_BELKIN ...@@ -421,7 +421,7 @@ config USB_BELKIN
microcontroller, with LEDs that indicate traffic. microcontroller, with LEDs that indicate traffic.
config USB_ARMLINUX config USB_ARMLINUX
boolean "Embedded ARM Linux links (iPaq, ...)" bool "Embedded ARM Linux links (iPaq, ...)"
depends on USB_NET_CDC_SUBSET depends on USB_NET_CDC_SUBSET
default y default y
help help
...@@ -438,14 +438,14 @@ config USB_ARMLINUX ...@@ -438,14 +438,14 @@ config USB_ARMLINUX
this simpler protocol by installing a different kernel. this simpler protocol by installing a different kernel.
config USB_EPSON2888 config USB_EPSON2888
boolean "Epson 2888 based firmware (DEVELOPMENT)" bool "Epson 2888 based firmware (DEVELOPMENT)"
depends on USB_NET_CDC_SUBSET depends on USB_NET_CDC_SUBSET
help help
Choose this option to support the usb networking links used Choose this option to support the usb networking links used
by some sample firmware from Epson. by some sample firmware from Epson.
config USB_KC2190 config USB_KC2190
boolean "KT Technology KC2190 based cables (InstaNet)" bool "KT Technology KC2190 based cables (InstaNet)"
depends on USB_NET_CDC_SUBSET depends on USB_NET_CDC_SUBSET
help help
Choose this option if you're using a host-to-host cable Choose this option if you're using a host-to-host cable
......
drivers/net/wireless/rt2x00/Kconfig
View file @ b11a2783
...@@ -243,14 +243,14 @@ config RT2X00_LIB ...@@ -243,14 +243,14 @@ config RT2X00_LIB
select AVERAGE select AVERAGE
config RT2X00_LIB_FIRMWARE config RT2X00_LIB_FIRMWARE
boolean bool
select FW_LOADER select FW_LOADER
config RT2X00_LIB_CRYPTO config RT2X00_LIB_CRYPTO
boolean bool
config RT2X00_LIB_LEDS config RT2X00_LIB_LEDS
boolean bool
default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n) default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)
config RT2X00_LIB_DEBUGFS config RT2X00_LIB_DEBUGFS
......
drivers/pci/pcie/aer/Kconfig
View file @ b11a2783
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
config PCIEAER config PCIEAER
boolean "Root Port Advanced Error Reporting support" bool "Root Port Advanced Error Reporting support"
depends on PCIEPORTBUS depends on PCIEPORTBUS
select RAS select RAS
default y default y
......
drivers/rtc/Kconfig
View file @ b11a2783
...@@ -65,7 +65,7 @@ config RTC_DEBUG ...@@ -65,7 +65,7 @@ config RTC_DEBUG
comment "RTC interfaces" comment "RTC interfaces"
config RTC_INTF_SYSFS config RTC_INTF_SYSFS
boolean "/sys/class/rtc/rtcN (sysfs)" bool "/sys/class/rtc/rtcN (sysfs)"
depends on SYSFS depends on SYSFS
default RTC_CLASS default RTC_CLASS
help help
...@@ -75,7 +75,7 @@ config RTC_INTF_SYSFS ...@@ -75,7 +75,7 @@ config RTC_INTF_SYSFS
If unsure, say Y. If unsure, say Y.
config RTC_INTF_PROC config RTC_INTF_PROC
boolean "/proc/driver/rtc (procfs for rtcN)" bool "/proc/driver/rtc (procfs for rtcN)"
depends on PROC_FS depends on PROC_FS
default RTC_CLASS default RTC_CLASS
help help
...@@ -88,7 +88,7 @@ config RTC_INTF_PROC ...@@ -88,7 +88,7 @@ config RTC_INTF_PROC
If unsure, say Y. If unsure, say Y.
config RTC_INTF_DEV config RTC_INTF_DEV
boolean "/dev/rtcN (character devices)" bool "/dev/rtcN (character devices)"
default RTC_CLASS default RTC_CLASS
help help
Say yes here if you want to use your RTCs using the /dev Say yes here if you want to use your RTCs using the /dev
...@@ -466,7 +466,7 @@ config RTC_DRV_DM355EVM ...@@ -466,7 +466,7 @@ config RTC_DRV_DM355EVM
Supports the RTC firmware in the MSP430 on the DM355 EVM. Supports the RTC firmware in the MSP430 on the DM355 EVM.
config RTC_DRV_TWL92330 config RTC_DRV_TWL92330
boolean "TI TWL92330/Menelaus" bool "TI TWL92330/Menelaus"
depends on MENELAUS depends on MENELAUS
help help
If you say yes here you get support for the RTC on the If you say yes here you get support for the RTC on the
......
drivers/spi/Kconfig
View file @ b11a2783
...@@ -29,7 +29,7 @@ menuconfig SPI ...@@ -29,7 +29,7 @@ menuconfig SPI
if SPI if SPI
config SPI_DEBUG config SPI_DEBUG
boolean "Debug support for SPI drivers" bool "Debug support for SPI drivers"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
help help
Say "yes" to enable debug messaging (like dev_dbg and pr_debug), Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
...@@ -40,8 +40,8 @@ config SPI_DEBUG ...@@ -40,8 +40,8 @@ config SPI_DEBUG
# #
config SPI_MASTER config SPI_MASTER
# boolean "SPI Master Support" # bool "SPI Master Support"
boolean bool
default SPI default SPI
help help
If your system has an master-capable SPI controller (which If your system has an master-capable SPI controller (which
......
drivers/staging/board/Kconfig
View file @ b11a2783
config STAGING_BOARD config STAGING_BOARD
boolean "Staging Board Support" bool "Staging Board Support"
depends on OF_ADDRESS depends on OF_ADDRESS
depends on BROKEN depends on BROKEN
help help
......
drivers/staging/emxx_udc/Kconfig
View file @ b11a2783
config USB_EMXX config USB_EMXX
boolean "EMXX USB Function Device Controller" bool "EMXX USB Function Device Controller"
depends on USB_GADGET && (ARCH_SHMOBILE || (ARM && COMPILE_TEST)) depends on USB_GADGET && (ARCH_SHMOBILE || (ARM && COMPILE_TEST))
help help
The Emma Mobile series of SoCs from Renesas Electronics and The Emma Mobile series of SoCs from Renesas Electronics and
......
drivers/staging/iio/Kconfig
View file @ b11a2783
...@@ -30,13 +30,13 @@ config IIO_SIMPLE_DUMMY ...@@ -30,13 +30,13 @@ config IIO_SIMPLE_DUMMY
if IIO_SIMPLE_DUMMY if IIO_SIMPLE_DUMMY
config IIO_SIMPLE_DUMMY_EVENTS config IIO_SIMPLE_DUMMY_EVENTS
boolean "Event generation support" bool "Event generation support"
select IIO_DUMMY_EVGEN select IIO_DUMMY_EVGEN
help help
Add some dummy events to the simple dummy driver. Add some dummy events to the simple dummy driver.
config IIO_SIMPLE_DUMMY_BUFFER config IIO_SIMPLE_DUMMY_BUFFER
boolean "Buffered capture support" bool "Buffered capture support"
select IIO_BUFFER select IIO_BUFFER
select IIO_KFIFO_BUF select IIO_KFIFO_BUF
help help
......
drivers/tty/serial/Kconfig
View file @ b11a2783
...@@ -489,7 +489,7 @@ config SERIAL_MFD_HSU ...@@ -489,7 +489,7 @@ config SERIAL_MFD_HSU
select SERIAL_CORE select SERIAL_CORE
config SERIAL_MFD_HSU_CONSOLE config SERIAL_MFD_HSU_CONSOLE
boolean "Medfile HSU serial console support" bool "Medfile HSU serial console support"
depends on SERIAL_MFD_HSU=y depends on SERIAL_MFD_HSU=y
select SERIAL_CORE_CONSOLE select SERIAL_CORE_CONSOLE
......
drivers/usb/gadget/Kconfig
View file @ b11a2783
...@@ -45,7 +45,7 @@ menuconfig USB_GADGET ...@@ -45,7 +45,7 @@ menuconfig USB_GADGET
if USB_GADGET if USB_GADGET
config USB_GADGET_DEBUG config USB_GADGET_DEBUG
boolean "Debugging messages (DEVELOPMENT)" bool "Debugging messages (DEVELOPMENT)"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
help help
Many controller and gadget drivers will print some debugging Many controller and gadget drivers will print some debugging
...@@ -73,7 +73,7 @@ config USB_GADGET_VERBOSE ...@@ -73,7 +73,7 @@ config USB_GADGET_VERBOSE
production build. production build.
config USB_GADGET_DEBUG_FILES config USB_GADGET_DEBUG_FILES
boolean "Debugging information files (DEVELOPMENT)" bool "Debugging information files (DEVELOPMENT)"
depends on PROC_FS depends on PROC_FS
help help
Some of the drivers in the "gadget" framework can expose Some of the drivers in the "gadget" framework can expose
...@@ -84,7 +84,7 @@ config USB_GADGET_DEBUG_FILES ...@@ -84,7 +84,7 @@ config USB_GADGET_DEBUG_FILES
here. If in doubt, or to conserve kernel memory, say "N". here. If in doubt, or to conserve kernel memory, say "N".
config USB_GADGET_DEBUG_FS config USB_GADGET_DEBUG_FS
boolean "Debugging information files in debugfs (DEVELOPMENT)" bool "Debugging information files in debugfs (DEVELOPMENT)"
depends on DEBUG_FS depends on DEBUG_FS
help help
Some of the drivers in the "gadget" framework can expose Some of the drivers in the "gadget" framework can expose
...@@ -230,7 +230,7 @@ config USB_CONFIGFS ...@@ -230,7 +230,7 @@ config USB_CONFIGFS
For more information see Documentation/usb/gadget_configfs.txt. For more information see Documentation/usb/gadget_configfs.txt.
config USB_CONFIGFS_SERIAL config USB_CONFIGFS_SERIAL
boolean "Generic serial bulk in/out" bool "Generic serial bulk in/out"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on TTY depends on TTY
select USB_U_SERIAL select USB_U_SERIAL
...@@ -239,7 +239,7 @@ config USB_CONFIGFS_SERIAL ...@@ -239,7 +239,7 @@ config USB_CONFIGFS_SERIAL
The function talks to the Linux-USB generic serial driver. The function talks to the Linux-USB generic serial driver.
config USB_CONFIGFS_ACM config USB_CONFIGFS_ACM
boolean "Abstract Control Model (CDC ACM)" bool "Abstract Control Model (CDC ACM)"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on TTY depends on TTY
select USB_U_SERIAL select USB_U_SERIAL
...@@ -249,7 +249,7 @@ config USB_CONFIGFS_ACM ...@@ -249,7 +249,7 @@ config USB_CONFIGFS_ACM
MS-Windows hosts or with the Linux-USB "cdc-acm" driver. MS-Windows hosts or with the Linux-USB "cdc-acm" driver.
config USB_CONFIGFS_OBEX config USB_CONFIGFS_OBEX
boolean "Object Exchange Model (CDC OBEX)" bool "Object Exchange Model (CDC OBEX)"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on TTY depends on TTY
select USB_U_SERIAL select USB_U_SERIAL
...@@ -259,7 +259,7 @@ config USB_CONFIGFS_OBEX ...@@ -259,7 +259,7 @@ config USB_CONFIGFS_OBEX
since the kernel itself doesn't implement the OBEX protocol. since the kernel itself doesn't implement the OBEX protocol.
config USB_CONFIGFS_NCM config USB_CONFIGFS_NCM
boolean "Network Control Model (CDC NCM)" bool "Network Control Model (CDC NCM)"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on NET depends on NET
select USB_U_ETHER select USB_U_ETHER
...@@ -270,7 +270,7 @@ config USB_CONFIGFS_NCM ...@@ -270,7 +270,7 @@ config USB_CONFIGFS_NCM
different alignment possibilities. different alignment possibilities.
config USB_CONFIGFS_ECM config USB_CONFIGFS_ECM
boolean "Ethernet Control Model (CDC ECM)" bool "Ethernet Control Model (CDC ECM)"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on NET depends on NET
select USB_U_ETHER select USB_U_ETHER
...@@ -282,7 +282,7 @@ config USB_CONFIGFS_ECM ...@@ -282,7 +282,7 @@ config USB_CONFIGFS_ECM
supported by firmware for smart network devices. supported by firmware for smart network devices.
config USB_CONFIGFS_ECM_SUBSET config USB_CONFIGFS_ECM_SUBSET
boolean "Ethernet Control Model (CDC ECM) subset" bool "Ethernet Control Model (CDC ECM) subset"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on NET depends on NET
select USB_U_ETHER select USB_U_ETHER
...@@ -323,7 +323,7 @@ config USB_CONFIGFS_EEM ...@@ -323,7 +323,7 @@ config USB_CONFIGFS_EEM
the host is the same (a usbX device), so the differences are minimal. the host is the same (a usbX device), so the differences are minimal.
config USB_CONFIGFS_PHONET config USB_CONFIGFS_PHONET
boolean "Phonet protocol" bool "Phonet protocol"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on NET depends on NET
depends on PHONET depends on PHONET
...@@ -333,7 +333,7 @@ config USB_CONFIGFS_PHONET ...@@ -333,7 +333,7 @@ config USB_CONFIGFS_PHONET
The Phonet protocol implementation for USB device. The Phonet protocol implementation for USB device.
config USB_CONFIGFS_MASS_STORAGE config USB_CONFIGFS_MASS_STORAGE
boolean "Mass storage" bool "Mass storage"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on BLOCK depends on BLOCK
select USB_F_MASS_STORAGE select USB_F_MASS_STORAGE
...@@ -344,7 +344,7 @@ config USB_CONFIGFS_MASS_STORAGE ...@@ -344,7 +344,7 @@ config USB_CONFIGFS_MASS_STORAGE
specified as a module parameter or sysfs option. specified as a module parameter or sysfs option.
config USB_CONFIGFS_F_LB_SS config USB_CONFIGFS_F_LB_SS
boolean "Loopback and sourcesink function (for testing)" bool "Loopback and sourcesink function (for testing)"
depends on USB_CONFIGFS depends on USB_CONFIGFS
select USB_F_SS_LB select USB_F_SS_LB
help help
...@@ -357,7 +357,7 @@ config USB_CONFIGFS_F_LB_SS ...@@ -357,7 +357,7 @@ config USB_CONFIGFS_F_LB_SS
and its driver through a basic set of functional tests. and its driver through a basic set of functional tests.
config USB_CONFIGFS_F_FS config USB_CONFIGFS_F_FS
boolean "Function filesystem (FunctionFS)" bool "Function filesystem (FunctionFS)"
depends on USB_CONFIGFS depends on USB_CONFIGFS
select USB_F_FS select USB_F_FS
help help
...@@ -369,7 +369,7 @@ config USB_CONFIGFS_F_FS ...@@ -369,7 +369,7 @@ config USB_CONFIGFS_F_FS
mass storage) and other are implemented in user space. mass storage) and other are implemented in user space.
config USB_CONFIGFS_F_UAC1 config USB_CONFIGFS_F_UAC1
boolean "Audio Class 1.0" bool "Audio Class 1.0"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on SND depends on SND
select USB_LIBCOMPOSITE select USB_LIBCOMPOSITE
...@@ -382,7 +382,7 @@ config USB_CONFIGFS_F_UAC1 ...@@ -382,7 +382,7 @@ config USB_CONFIGFS_F_UAC1
on the device. on the device.
config USB_CONFIGFS_F_UAC2 config USB_CONFIGFS_F_UAC2
boolean "Audio Class 2.0" bool "Audio Class 2.0"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on SND depends on SND
select USB_LIBCOMPOSITE select USB_LIBCOMPOSITE
...@@ -400,7 +400,7 @@ config USB_CONFIGFS_F_UAC2 ...@@ -400,7 +400,7 @@ config USB_CONFIGFS_F_UAC2
wants as audio data to the USB Host. wants as audio data to the USB Host.
config USB_CONFIGFS_F_MIDI config USB_CONFIGFS_F_MIDI
boolean "MIDI function" bool "MIDI function"
depends on USB_CONFIGFS depends on USB_CONFIGFS
depends on SND depends on SND
select USB_LIBCOMPOSITE select USB_LIBCOMPOSITE
...@@ -414,7 +414,7 @@ config USB_CONFIGFS_F_MIDI ...@@ -414,7 +414,7 @@ config USB_CONFIGFS_F_MIDI
ALSA's aconnect utility etc. ALSA's aconnect utility etc.
config USB_CONFIGFS_F_HID config USB_CONFIGFS_F_HID
boolean "HID function" bool "HID function"
depends on USB_CONFIGFS depends on USB_CONFIGFS
select USB_F_HID select USB_F_HID
help help
......
drivers/usb/gadget/legacy/Kconfig
View file @ b11a2783
...@@ -40,7 +40,7 @@ config USB_ZERO ...@@ -40,7 +40,7 @@ config USB_ZERO
dynamically linked module called "g_zero". dynamically linked module called "g_zero".
config USB_ZERO_HNPTEST config USB_ZERO_HNPTEST
boolean "HNP Test Device" bool "HNP Test Device"
depends on USB_ZERO && USB_OTG depends on USB_ZERO && USB_OTG
help help
You can configure this device to enumerate using the device You can configure this device to enumerate using the device
......
drivers/usb/gadget/udc/Kconfig
View file @ b11a2783
...@@ -199,7 +199,7 @@ config USB_S3C2410 ...@@ -199,7 +199,7 @@ config USB_S3C2410
S3C2440 processors. S3C2440 processors.
config USB_S3C2410_DEBUG config USB_S3C2410_DEBUG
boolean "S3C2410 udc debug messages" bool "S3C2410 udc debug messages"
depends on USB_S3C2410 depends on USB_S3C2410
config USB_S3C_HSUDC config USB_S3C_HSUDC
...@@ -288,7 +288,7 @@ config USB_NET2272 ...@@ -288,7 +288,7 @@ config USB_NET2272
gadget drivers to also be dynamically linked. gadget drivers to also be dynamically linked.
config USB_NET2272_DMA config USB_NET2272_DMA
boolean "Support external DMA controller" bool "Support external DMA controller"
depends on USB_NET2272 && HAS_DMA depends on USB_NET2272 && HAS_DMA
help help
The NET2272 part can optionally support an external DMA The NET2272 part can optionally support an external DMA
......
drivers/usb/phy/Kconfig
View file @ b11a2783
...@@ -119,7 +119,7 @@ config TAHVO_USB ...@@ -119,7 +119,7 @@ config TAHVO_USB
config TAHVO_USB_HOST_BY_DEFAULT config TAHVO_USB_HOST_BY_DEFAULT
depends on TAHVO_USB depends on TAHVO_USB
boolean "Device in USB host mode by default" bool "Device in USB host mode by default"
help help
Say Y here, if you want the device to enter USB host mode Say Y here, if you want the device to enter USB host mode
by default on bootup. by default on bootup.
......
init/Kconfig
View file @ b11a2783
...@@ -921,7 +921,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED ...@@ -921,7 +921,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
machine. machine.
menuconfig CGROUPS menuconfig CGROUPS
boolean "Control Group support" bool "Control Group support"
select KERNFS select KERNFS
help help
This option adds support for grouping sets of processes together, for This option adds support for grouping sets of processes together, for
...@@ -1762,7 +1762,7 @@ config SLABINFO ...@@ -1762,7 +1762,7 @@ config SLABINFO
default y default y
config RT_MUTEXES config RT_MUTEXES
boolean bool
config BASE_SMALL config BASE_SMALL
int int
......
lib/Kconfig
View file @ b11a2783
...@@ -23,7 +23,7 @@ config HAVE_ARCH_BITREVERSE ...@@ -23,7 +23,7 @@ config HAVE_ARCH_BITREVERSE
have this capability. have this capability.
config RATIONAL config RATIONAL
boolean bool
config GENERIC_STRNCPY_FROM_USER config GENERIC_STRNCPY_FROM_USER
bool bool
...@@ -48,14 +48,14 @@ config GENERIC_IOMAP ...@@ -48,14 +48,14 @@ config GENERIC_IOMAP
select GENERIC_PCI_IOMAP select GENERIC_PCI_IOMAP
config GENERIC_IO config GENERIC_IO
boolean bool
default n default n
config STMP_DEVICE config STMP_DEVICE
bool bool
config PERCPU_RWSEM config PERCPU_RWSEM
boolean bool
config ARCH_USE_CMPXCHG_LOCKREF config ARCH_USE_CMPXCHG_LOCKREF
bool bool
...@@ -266,7 +266,7 @@ config DECOMPRESS_LZ4 ...@@ -266,7 +266,7 @@ config DECOMPRESS_LZ4
# Generic allocator support is selected if needed # Generic allocator support is selected if needed
# #
config GENERIC_ALLOCATOR config GENERIC_ALLOCATOR
boolean bool
# #
# reed solomon support is select'ed if needed # reed solomon support is select'ed if needed
...@@ -275,16 +275,16 @@ config REED_SOLOMON ...@@ -275,16 +275,16 @@ config REED_SOLOMON
tristate tristate
config REED_SOLOMON_ENC8 config REED_SOLOMON_ENC8
boolean bool
config REED_SOLOMON_DEC8 config REED_SOLOMON_DEC8
boolean bool
config REED_SOLOMON_ENC16 config REED_SOLOMON_ENC16
boolean bool
config REED_SOLOMON_DEC16 config REED_SOLOMON_DEC16
boolean bool
# #
# BCH support is selected if needed # BCH support is selected if needed
...@@ -293,7 +293,7 @@ config BCH ...@@ -293,7 +293,7 @@ config BCH
tristate tristate
config BCH_CONST_PARAMS config BCH_CONST_PARAMS
boolean bool
help help
Drivers may select this option to force specific constant Drivers may select this option to force specific constant
values for parameters 'm' (Galois field order) and 't' values for parameters 'm' (Galois field order) and 't'
...@@ -329,7 +329,7 @@ config BCH_CONST_T ...@@ -329,7 +329,7 @@ config BCH_CONST_T
# Textsearch support is select'ed if needed # Textsearch support is select'ed if needed
# #
config TEXTSEARCH config TEXTSEARCH
boolean bool
config TEXTSEARCH_KMP config TEXTSEARCH_KMP
tristate tristate
...@@ -341,10 +341,10 @@ config TEXTSEARCH_FSM ...@@ -341,10 +341,10 @@ config TEXTSEARCH_FSM
tristate tristate
config BTREE config BTREE
boolean bool
config INTERVAL_TREE config INTERVAL_TREE
boolean bool
help help
Simple, embeddable, interval-tree. Can find the start of an Simple, embeddable, interval-tree. Can find the start of an
overlapping range in log(n) time and then iterate over all overlapping range in log(n) time and then iterate over all
...@@ -372,18 +372,18 @@ config ASSOCIATIVE_ARRAY ...@@ -372,18 +372,18 @@ config ASSOCIATIVE_ARRAY
for more information. for more information.
config HAS_IOMEM config HAS_IOMEM
boolean bool
depends on !NO_IOMEM depends on !NO_IOMEM
select GENERIC_IO select GENERIC_IO
default y default y
config HAS_IOPORT_MAP config HAS_IOPORT_MAP
boolean bool
depends on HAS_IOMEM && !NO_IOPORT_MAP depends on HAS_IOMEM && !NO_IOPORT_MAP
default y default y
config HAS_DMA config HAS_DMA
boolean bool
depends on !NO_DMA depends on !NO_DMA
default y default y
......
mm/Kconfig
View file @ b11a2783
...@@ -129,28 +129,28 @@ config SPARSEMEM_VMEMMAP ...@@ -129,28 +129,28 @@ config SPARSEMEM_VMEMMAP
efficient option when sufficient kernel resources are available. efficient option when sufficient kernel resources are available.
config HAVE_MEMBLOCK config HAVE_MEMBLOCK
boolean bool
config HAVE_MEMBLOCK_NODE_MAP config HAVE_MEMBLOCK_NODE_MAP
boolean bool
config HAVE_MEMBLOCK_PHYS_MAP config HAVE_MEMBLOCK_PHYS_MAP
boolean bool
config HAVE_GENERIC_RCU_GUP config HAVE_GENERIC_RCU_GUP
boolean bool
config ARCH_DISCARD_MEMBLOCK config ARCH_DISCARD_MEMBLOCK
boolean bool
config NO_BOOTMEM config NO_BOOTMEM
boolean bool
config MEMORY_ISOLATION config MEMORY_ISOLATION
boolean bool
config MOVABLE_NODE config MOVABLE_NODE
boolean "Enable to assign a node which has only movable memory" bool "Enable to assign a node which has only movable memory"
depends on HAVE_MEMBLOCK depends on HAVE_MEMBLOCK
depends on NO_BOOTMEM depends on NO_BOOTMEM
depends on X86_64 depends on X86_64
...@@ -228,12 +228,12 @@ config SPLIT_PTLOCK_CPUS ...@@ -228,12 +228,12 @@ config SPLIT_PTLOCK_CPUS
default "4" default "4"
config ARCH_ENABLE_SPLIT_PMD_PTLOCK config ARCH_ENABLE_SPLIT_PMD_PTLOCK
boolean bool
# #
# support for memory balloon # support for memory balloon
config MEMORY_BALLOON config MEMORY_BALLOON
boolean bool
# #
# support for memory balloon compaction # support for memory balloon compaction
...@@ -276,7 +276,7 @@ config MIGRATION ...@@ -276,7 +276,7 @@ config MIGRATION
allocation instead of reclaiming. allocation instead of reclaiming.
config ARCH_ENABLE_HUGEPAGE_MIGRATION config ARCH_ENABLE_HUGEPAGE_MIGRATION
boolean bool
config PHYS_ADDR_T_64BIT config PHYS_ADDR_T_64BIT
def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT
......
net/Kconfig
View file @ b11a2783
...@@ -231,18 +231,18 @@ source "net/hsr/Kconfig" ...@@ -231,18 +231,18 @@ source "net/hsr/Kconfig"
source "net/switchdev/Kconfig" source "net/switchdev/Kconfig"
config RPS config RPS
boolean bool
depends on SMP && SYSFS depends on SMP && SYSFS
default y default y
config RFS_ACCEL config RFS_ACCEL
boolean bool
depends on RPS depends on RPS
select CPU_RMAP select CPU_RMAP
default y default y
config XPS config XPS
boolean bool
depends on SMP depends on SMP
default y default y
...@@ -254,18 +254,18 @@ config CGROUP_NET_PRIO ...@@ -254,18 +254,18 @@ config CGROUP_NET_PRIO
a per-interface basis. a per-interface basis.
config CGROUP_NET_CLASSID config CGROUP_NET_CLASSID
boolean "Network classid cgroup" bool "Network classid cgroup"
depends on CGROUPS depends on CGROUPS
---help--- ---help---
Cgroup subsystem for use as general purpose socket classid marker that is Cgroup subsystem for use as general purpose socket classid marker that is
being used in cls_cgroup and for netfilter matching. being used in cls_cgroup and for netfilter matching.
config NET_RX_BUSY_POLL config NET_RX_BUSY_POLL
boolean bool
default y default y
config BQL config BQL
boolean bool
depends on SYSFS depends on SYSFS
select DQL select DQL
default y default y
...@@ -282,7 +282,7 @@ config BPF_JIT ...@@ -282,7 +282,7 @@ config BPF_JIT
this feature changing /proc/sys/net/core/bpf_jit_enable this feature changing /proc/sys/net/core/bpf_jit_enable
config NET_FLOW_LIMIT config NET_FLOW_LIMIT
boolean bool
depends on RPS depends on RPS
default y default y
---help--- ---help---
......
net/sched/Kconfig
View file @ b11a2783
...@@ -348,7 +348,7 @@ config NET_SCH_PLUG ...@@ -348,7 +348,7 @@ config NET_SCH_PLUG
comment "Classification" comment "Classification"
config NET_CLS config NET_CLS
boolean bool
config NET_CLS_BASIC config NET_CLS_BASIC
tristate "Elementary classification (BASIC)" tristate "Elementary classification (BASIC)"
......
net/switchdev/Kconfig
View file @ b11a2783
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
config NET_SWITCHDEV config NET_SWITCHDEV
boolean "Switch (and switch-ish) device support (EXPERIMENTAL)" bool "Switch (and switch-ish) device support (EXPERIMENTAL)"
depends on INET depends on INET
---help--- ---help---
This module provides glue between core networking code and device This module provides glue between core networking code and device
......
scripts/kconfig/confdata.c
View file @ b11a2783
...@@ -59,6 +59,7 @@ static void conf_message(const char *fmt, ...) ...@@ -59,6 +59,7 @@ static void conf_message(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
if (conf_message_callback) if (conf_message_callback)
conf_message_callback(fmt, ap); conf_message_callback(fmt, ap);
va_end(ap);
} }
const char *conf_get_configname(void) const char *conf_get_configname(void)
......
scripts/kconfig/merge_config.sh
View file @ b11a2783
...@@ -77,6 +77,11 @@ while true; do ...@@ -77,6 +77,11 @@ while true; do
esac esac
done done
if [ "$#" -lt 2 ] ; then
usage
exit
fi
INITFILE=$1 INITFILE=$1
shift; shift;
......
security/integrity/Kconfig
View file @ b11a2783
...@@ -16,7 +16,7 @@ config INTEGRITY ...@@ -16,7 +16,7 @@ config INTEGRITY
if INTEGRITY if INTEGRITY
config INTEGRITY_SIGNATURE config INTEGRITY_SIGNATURE
boolean "Digital signature verification using multiple keyrings" bool "Digital signature verification using multiple keyrings"
depends on KEYS depends on KEYS
default n default n
select SIGNATURE select SIGNATURE
...@@ -30,7 +30,7 @@ config INTEGRITY_SIGNATURE ...@@ -30,7 +30,7 @@ config INTEGRITY_SIGNATURE
usually only added from initramfs. usually only added from initramfs.
config INTEGRITY_ASYMMETRIC_KEYS config INTEGRITY_ASYMMETRIC_KEYS
boolean "Enable asymmetric keys support" bool "Enable asymmetric keys support"
depends on INTEGRITY_SIGNATURE depends on INTEGRITY_SIGNATURE
default n default n
select ASYMMETRIC_KEY_TYPE select ASYMMETRIC_KEY_TYPE
......
security/integrity/evm/Kconfig
View file @ b11a2783
config EVM config EVM
boolean "EVM support" bool "EVM support"
select KEYS select KEYS
select ENCRYPTED_KEYS select ENCRYPTED_KEYS
select CRYPTO_HMAC select CRYPTO_HMAC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7