Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (51399a39) · Commits · 戴 / test

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits) kbuild: convert `arch/tile' to the kconfig mainmenu upgrade README: cite nconfig Revert "kconfig: Temporarily disable dependency warnings" kconfig: Use PATH_MAX instead of 128 for path buffer sizes. kconfig: Fix realloc usage() kconfig: Propagate const kconfig: Don't go out from read config loop when you read new symbol kconfig: fix menuconfig on debian lenny kbuild: migrate all arch to the kconfig mainmenu upgrade kconfig: expand file names kconfig: use the file's name of sourced file kconfig: constify file name kconfig: don't emit warning upon rootmenu's prompt redefinition kconfig: replace KERNELVERSION usage by the mainmenu's prompt kconfig: delay gconf window initialization kconfig: expand by default the rootmenu's prompt kconfig: add a symbol string expansion helper kconfig: regen parser kconfig: implement the `mainmenu' directive kconfig: allow PACKAGE to be defined on the compiler's command-line ... Fix up trivial conflict in arch/mn10300/Kconfig

Documentation/kbuild/kconfig-language.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -322,7 +322,8 @@ mainmenu:
		"mainmenu" <prompt>

		This sets the config program's title bar if the config program chooses
		to use it.
		to use it. It should be placed at the top of the configuration, before any
		other statement.


		Kconfig hints

Kconfig

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		#
		# For a description of the syntax of this configuration file,
		# see Documentation/kbuild/kconfig-language.txt.
		#
		mainmenu "Linux/$ARCH $KERNELVERSION Kernel Configuration"

		config SRCARCH
		string
		option env="SRCARCH"

		source "arch/$SRCARCH/Kconfig"

README

+1 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ CONFIGURING the kernel:
		- Alternate configuration commands are:
		"make config" Plain text interface.
		"make menuconfig" Text based color menus, radiolists & dialogs.
		"make nconfig" Enhanced text based color menus.
		"make xconfig" X windows (Qt) based configuration tool.
		"make gconfig" X windows (Gtk) based configuration tool.
		"make oldconfig" Default all questions based on the contents of

arch/alpha/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		#
		# For a description of the syntax of this configuration file,
		# see Documentation/kbuild/kconfig-language.txt.
		#
		config ALPHA
		bool
		default y

arch/arm/Kconfig

+0 −7

Original line number	Diff line number	Diff line
		#
		# For a description of the syntax of this configuration file,
		# see Documentation/kbuild/kconfig-language.txt.
		#

		mainmenu "Linux Kernel Configuration"

		config ARM
		bool
		default y

Admin message