aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mn10300
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 19:16:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 19:16:39 -0400
commit51399a391940e676877c7a791138081f13a0bab7 (patch)
tree6caefb858ee4b31172b85ec7bcedb826a29a551b /arch/mn10300
parentb779b332d0e1ef68f40867948ae5526a3e925163 (diff)
parentdf4d303647ebe5e2f7e473e32ccef9f8549e9d45 (diff)
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/mn10300')
-rw-r--r--arch/mn10300/Kconfig9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 365766a3d536..41ba38513c89 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Linux Kernel Configuration"
7
8config MN10300 1config MN10300
9 def_bool y 2 def_bool y
10 select HAVE_OPROFILE 3 select HAVE_OPROFILE
@@ -93,8 +86,6 @@ config GENERIC_HARDIRQS
93config HOTPLUG_CPU 86config HOTPLUG_CPU
94 def_bool n 87 def_bool n
95 88
96mainmenu "Panasonic MN10300/AM33 Kernel Configuration"
97
98source "init/Kconfig" 89source "init/Kconfig"
99 90
100source "kernel/Kconfig.freezer" 91source "kernel/Kconfig.freezer"