diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 13:36:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 13:36:45 -0500 |
| commit | b11a2783974791d37e44abbb48d41e8c120b5126 (patch) | |
| tree | 5e0cb2b934a01ce7e3fb78614b578b188b840134 /drivers/isdn | |
| 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/isdn')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig index b8611e3e5e74..09df54fc1fef 100644 --- a/drivers/isdn/hardware/mISDN/Kconfig +++ b/drivers/isdn/hardware/mISDN/Kconfig | |||
| @@ -24,7 +24,7 @@ config MISDN_HFCMULTI | |||
| 24 | * HFC-E1 (E1 interface for 2Mbit ISDN) | 24 | * HFC-E1 (E1 interface for 2Mbit ISDN) |
| 25 | 25 | ||
| 26 | config MISDN_HFCMULTI_8xx | 26 | config MISDN_HFCMULTI_8xx |
| 27 | boolean "Support for XHFC embedded board in HFC multiport driver" | 27 | bool "Support for XHFC embedded board in HFC multiport driver" |
| 28 | depends on MISDN | 28 | depends on MISDN |
| 29 | depends on MISDN_HFCMULTI | 29 | depends on MISDN_HFCMULTI |
| 30 | depends on 8xx | 30 | depends on 8xx |