diff --git a/[refs] b/[refs] index e048cbba1ed8..c678b394f928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6ef9c8f1635ccd175be9eb5d36c376ffb8fbc51 +refs/heads/master: ed3473b18f85b591c1e8afec831e9e06120142b7 diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig index 444b9f918fdf..7c2a2f7f8dc1 100644 --- a/trunk/arch/mn10300/Kconfig +++ b/trunk/arch/mn10300/Kconfig @@ -8,7 +8,6 @@ mainmenu "Linux Kernel Configuration" config MN10300 def_bool y select HAVE_OPROFILE - select HAVE_ARCH_TRACEHOOK config AM33 def_bool y