summaryrefslogtreecommitdiffstats
path: root/Documentation/kbuild
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@anciens.enib.fr>2010-12-16 00:19:00 +0100
committerMichal Marek <mmarek@suse.cz>2010-12-21 18:15:43 +0100
commit0719e1d23aab3b445c823404fd1b8b027757bb0a (patch)
tree3e73a963bdbf14bbda344b02eb76b634fbd825d8 /Documentation/kbuild
parentkbuild: add numeric --set-val option to scripts/config (diff)
downloadlinux-0719e1d23aab3b445c823404fd1b8b027757bb0a.tar.xz
linux-0719e1d23aab3b445c823404fd1b8b027757bb0a.zip
Documentation/kbuild: add info that 'choice' can have a symbol name
Changeset 5a1aa8a1 added the possibility to name a choice, and to have the same choice be defined multiple times. But the documentation was forgotten, so this updates it accordingly. Thanks to Arnaud Lacombe for pointing it to me in the first place: http://www.spinics.net/lists/linux-kbuild/msg03940.html Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Arnaud Lacombe <lacombar@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'Documentation/kbuild')
-rw-r--r--Documentation/kbuild/kconfig-language.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt
index 2fe93ca7c77c..a4bbaaf34981 100644
--- a/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@ -268,7 +268,7 @@ separate list of options.
choices:
- "choice"
+ "choice" [symbol]
<choice options>
<choice block>
"endchoice"
@@ -282,6 +282,10 @@ single driver can be compiled/loaded into the kernel, but all drivers
can be compiled as modules.
A choice accepts another option "optional", which allows to set the
choice to 'n' and no entry needs to be selected.
+If no [symbol] is associated with a choice, then you can not have multiple
+definitions of that choice. If a [symbol] is associated to the choice,
+then you may define the same choice (ie. with the same entries) in another
+place.
comment: