path: root/drivers/net/ethernet/ti/Kconfig
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-19 10:36:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-19 10:36:45 -0800
commitb11a2783974791d37e44abbb48d41e8c120b5126 (patch)
tree5e0cb2b934a01ce7e3fb78614b578b188b840134 /drivers/net/ethernet/ti/Kconfig
parentMerge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild (diff)
parentkconfig: use va_end to match corresponding va_start (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/net/ethernet/ti/Kconfig')
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index 3bc992cd70b7..f6a71092e135 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -50,7 +50,7 @@ config TI_DAVINCI_CPDMA
will be called davinci_cpdma. This is recommended.
- boolean "TI CPSW Switch Phy sel Support"
+ bool "TI CPSW Switch Phy sel Support"
depends on TI_CPSW
This driver supports configuring of the phy mode connected to
@@ -77,7 +77,7 @@ config TI_CPSW
will be called cpsw.
config TI_CPTS
- boolean "TI Common Platform Time Sync (CPTS) Support"
+ bool "TI Common Platform Time Sync (CPTS) Support"
depends on TI_CPSW
select PTP_1588_CLOCK