summaryrefslogtreecommitdiff
path: root/net/sched/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-19 21:36:45 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-19 21:36:45 +0300
commitb11a2783974791d37e44abbb48d41e8c120b5126 (patch)
tree5e0cb2b934a01ce7e3fb78614b578b188b840134 /net/sched/Kconfig
parent773433433791b9420c2a0f86b93c91d4115d89b5 (diff)
parentb6a2ab2cd4739a9573ed41677e53171987b8da34 (diff)
downloadlinux-b11a2783974791d37e44abbb48d41e8c120b5126.tar.xz
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 'net/sched/Kconfig')
-rw-r--r--net/sched/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 899d0319f2b2..2274e723a3df 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -348,7 +348,7 @@ config NET_SCH_PLUG
comment "Classification"
config NET_CLS
- boolean
+ bool
config NET_CLS_BASIC
tristate "Elementary classification (BASIC)"