diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 10:36:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 10:36:45 -0800 |
| commit | b11a2783974791d37e44abbb48d41e8c120b5126 (patch) | |
| tree | 5e0cb2b934a01ce7e3fb78614b578b188b840134 /drivers/md/Kconfig | |
| parent | 773433433791b9420c2a0f86b93c91d4115d89b5 (diff) | |
| parent | b6a2ab2cd4739a9573ed41677e53171987b8da34 (diff) | |
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
Diffstat (limited to 'drivers/md/Kconfig')
| -rw-r--r-- | drivers/md/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index c39644478aa4..63e05e32b462 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -178,7 +178,7 @@ config MD_FAULTY source "drivers/md/bcache/Kconfig" config BLK_DEV_DM_BUILTIN - boolean + bool config BLK_DEV_DM tristate "Device mapper support" @@ -197,7 +197,7 @@ config BLK_DEV_DM If unsure, say N. config DM_DEBUG - boolean "Device mapper debugging support" + bool "Device mapper debugging support" depends on BLK_DEV_DM ---help--- Enable this for messages that may help debug device-mapper problems. |