Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index abaaa77..d5a1a12 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -77,6 +77,22 @@ config LOCALVERSION
          object and source tree, in that order.  Your total string can
          be a maximum of 64 characters.
 
+config LOCALVERSION_AUTO
+       bool "Automatically append version information to the version string"
+       default y
+       help
+         This will try to automatically determine if the current tree is a
+         release tree by looking for git tags that
+         belong to the current top of tree revision.
+
+         A string of the format -gxxxxxxxx will be added to the localversion
+         if a git based tree is found.  The string generated by this will be
+         appended after any matching localversion* files, and after the value
+         set in CONFIG_LOCALVERSION
+
+         Note: This requires Perl, and a git repository, but not necessarily
+         the git or cogito tools to be installed.
+
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
        depends on MMU
@@ -231,13 +247,15 @@ config CPUSETS
        bool "Cpuset support"
        depends on SMP
        help
-         This options will let you create and manage CPUSET's which
+         This option will let you create and manage CPUSETs which
          allow dynamically partitioning a system into sets of CPUs and
          Memory Nodes and assigning tasks to run only within those sets.
          This is primarily useful on large SMP or NUMA systems.
 
          Say N if unsure.
 
+source "usr/Kconfig"
+
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help