Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  Documentation/kbuild: add info that 'choice' can have a symbol name
  kbuild: add numeric --set-val option to scripts/config
  headers_check: Fix warning text
  headers_check: better search for functions in headers
  scripts/coccinelle: update for compatability with Coccinelle 0.2.4
  tags: put function prototypes back!
  Kconfig: fix single letter command in scripts/config
  gitignore: add scripts/recordmcount

diff --combined Documentation/kbuild/kconfig-language.txt
index 5b9b1be6fde2023d9c9f7609b6dd1f21adaf88d2,a4bbaaf34981dcf6e443a66f405aaa3049277d80..b507d61fd41cd6a20157dca27f38a28b98f4fa1d
--- 1/Documentation/kbuild/kconfig-language.txt
--- 2/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@@ -112,6 -112,7 +112,6 @@@ applicable everywhere (see syntax)
        (no prompts anywhere) and for symbols with no dependencies.
        That will limit the usefulness but on the other hand avoid
        the illegal configurations all over.
 -      kconfig should one day warn about such things.
  
  - numerical ranges: "range" <symbol> <symbol> ["if" <expr>]
    This allows to limit the range of possible input values for int
@@@ -267,7 -268,7 +267,7 @@@ separate list of options
  
  choices:
  
-       "choice"
+       "choice" [symbol]
        <choice options>
        <choice block>
        "endchoice"
@@@ -281,6 -282,10 +281,10 @@@ single driver can be compiled/loaded in
  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:
  

diff --combined scripts/tags.sh
index bbbe584d44943077a41b22684b5ecdbce18f532a,e091db312ddb048ecf5eb2057627dc182121b8ab..92fdc4546141125a14410af0b8d4b1ce8464e2fe
--- 1/scripts/tags.sh
--- 2/scripts/tags.sh
+++ b/scripts/tags.sh
@@@ -123,11 -123,9 +123,11 @@@ exuberant(
        -I ____cacheline_internodealigned_in_smp                \
        -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
        -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
-       --extra=+f --c-kinds=-px                                \
+       --extra=+f --c-kinds=+px                                \
        --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \
 -      --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/'
 +      --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
 +      --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'               \
 +      --regex-c++='/^DEFINE_EVENT\(([^,)]*).*/trace_\1/'
  
        all_kconfigs | xargs $1 -a                              \
        --langdef=kconfig --language-force=kconfig              \