diff --git a/[refs] b/[refs] index 1bb24d36f61c..10299fbf4723 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54b41b97fd07842d8b64963d538003c5f756ca12 +refs/heads/master: b7386a09ce7e8add333f5d67f2fe1b1eac1f4746 diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index d73bd4db5e84..c497307cf51b 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -157,7 +157,6 @@ config LOCKDEP_SUPPORT config HAVE_LATENCYTOP_SUPPORT def_bool y - depends on !SMP config ARCH_HAS_ILOG2_U32 def_bool n