From f3c23e1cd260c4a41d323f086cb3ac93abd553ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 16 Dec 2010 00:19:00 +0100 Subject: [PATCH] --- yaml --- r: 227684 b: refs/heads/master c: 0719e1d23aab3b445c823404fd1b8b027757bb0a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/kbuild/kconfig-language.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4915a1ebd2e6..ff7bbc6f6c63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0a6332ce221614fbd0731af92f668892fa4b700 +refs/heads/master: 0719e1d23aab3b445c823404fd1b8b027757bb0a diff --git a/trunk/Documentation/kbuild/kconfig-language.txt b/trunk/Documentation/kbuild/kconfig-language.txt index 2fe93ca7c77c..a4bbaaf34981 100644 --- a/trunk/Documentation/kbuild/kconfig-language.txt +++ b/trunk/Documentation/kbuild/kconfig-language.txt @@ -268,7 +268,7 @@ separate list of options. choices: - "choice" + "choice" [symbol] "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: