mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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
This commit is contained in:
commit
b11a278397
33 changed files with 105 additions and 99 deletions
|
|
@ -21,7 +21,7 @@ config IIO_BUFFER
|
|||
if IIO_BUFFER
|
||||
|
||||
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
|
||||
Should be selected by any drivers that do in-kernel push
|
||||
usage. That is, those where the data is pushed to the consumer.
|
||||
|
|
@ -43,7 +43,7 @@ config IIO_TRIGGERED_BUFFER
|
|||
endif # IIO_BUFFER
|
||||
|
||||
config IIO_TRIGGER
|
||||
boolean "Enable triggered sampling support"
|
||||
bool "Enable triggered sampling support"
|
||||
help
|
||||
Provides IIO core support for triggers. Currently these
|
||||
are used to initialize capture of samples to push into
|
||||
|
|
|
|||
Loading…
Reference in a new issue