diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 23:16:39 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 23:16:39 (GMT) |
commit | 51399a391940e676877c7a791138081f13a0bab7 (patch) | |
tree | 6caefb858ee4b31172b85ec7bcedb826a29a551b /arch/m68k | |
parent | b779b332d0e1ef68f40867948ae5526a3e925163 (diff) | |
parent | df4d303647ebe5e2f7e473e32ccef9f8549e9d45 (diff) | |
download | linux-fsl-qoriq-51399a391940e676877c7a791138081f13a0bab7.tar.xz |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* '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
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 77bb0d6..bc9271b 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -1,7 +1,3 @@ -# -# For a description of the syntax of this configuration file, -# see Documentation/kbuild/kconfig-language.txt. -# config M68K bool default y @@ -62,8 +58,6 @@ config HZ config ARCH_USES_GETTIMEOFFSET def_bool y -mainmenu "Linux/68k Kernel Configuration" - source "init/Kconfig" source "kernel/Kconfig.freezer" |