diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 01:16:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 01:16:39 +0200 |
| commit | 51399a391940e676877c7a791138081f13a0bab7 (patch) | |
| tree | 6caefb858ee4b31172b85ec7bcedb826a29a551b /arch/frv | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/same... (diff) | |
| parent | kbuild: convert `arch/tile' to the kconfig mainmenu upgrade (diff) | |
| download | linux-51399a391940e676877c7a791138081f13a0bab7.tar.xz linux-51399a391940e676877c7a791138081f13a0bab7.zip | |
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/frv')
| -rw-r--r-- | arch/frv/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 0f2417df6323..f6bcb039cd6d 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig @@ -1,7 +1,3 @@ -# -# For a description of the syntax of this configuration file, -# see Documentation/kbuild/kconfig-language.txt. -# config FRV bool default y @@ -61,8 +57,6 @@ config HZ int default 1000 -mainmenu "Fujitsu FR-V Kernel Configuration" - source "init/Kconfig" source "kernel/Kconfig.freezer" |