diff --git a/[refs] b/[refs] index 3c2baf6b9272..6f1fb7682d16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fae4fb3ce38cc657ff0aba570ae875aae2806d4 +refs/heads/master: 6fbfe8d7cd7e71ceb281c5a1b9de6e5e0dfbf1c8 diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index fa76d6264dff..f971cb74dd62 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -42,7 +42,7 @@ config SUPERH32 select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE select HAVE_FUNCTION_GRAPH_TRACER select HAVE_ARCH_KGDB - select HAVE_HW_BREAKPOINT if CPU_SH4A + select HAVE_HW_BREAKPOINT select PERF_EVENTS if HAVE_HW_BREAKPOINT select ARCH_HIBERNATION_POSSIBLE if MMU