Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates'

[safe/jmp/linux-2.6] / arch / sh / kernel / Makefile

diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 379053c..56704a6 100644 (file)
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_HIBERNATION)     += swsusp.o
 obj-$(CONFIG_DWARF_UNWINDER)   += dwarf.o
 obj-$(CONFIG_PERF_EVENTS)      += perf_event.o perf_callchain.o
 
+obj-$(CONFIG_HAVE_HW_BREAKPOINT)               += hw_breakpoint.o
 obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)    += localtimer.o
 
 EXTRA_CFLAGS += -Werror