git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
[safe/jmp/linux-2.6]
/
arch
/
mn10300
/
Kconfig
diff --git
a/arch/mn10300/Kconfig
b/arch/mn10300/Kconfig
index
dd557c9
..
89faaca
100644
(file)
--- a/
arch/mn10300/Kconfig
+++ b/
arch/mn10300/Kconfig
@@
-7,6
+7,8
@@
mainmenu "Linux Kernel Configuration"
config MN10300
def_bool y
config MN10300
def_bool y
+ select HAVE_OPROFILE
+ select HAVE_ARCH_TRACEHOOK
config AM33
def_bool y
config AM33
def_bool y
@@
-68,6
+70,8
@@
mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
source "init/Kconfig"
source "init/Kconfig"
+source "kernel/Kconfig.freezer"
+
menu "Matsushita MN10300 system setup"
menu "Matsushita MN10300 system setup"
@@
-367,5
+371,3
@@
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
-
-source "arch/mn10300/oprofile/Kconfig"