Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/…

…rric/oprofile into perf/urgent
mariux64 · Mar 17, 2011 · 8df341c · 8df341c
2 parents eb4316d + ec6b426
commit 8df341c
Show file tree

Hide file tree

Showing 7 changed files with 1,558 additions and 13 deletions.
diff --git a/arch/s390/oprofile/Makefile b/arch/s390/oprofile/Makefile
@@ -6,4 +6,4 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
 		oprofilefs.o oprofile_stats.o  \
 		timer_int.o )
 
-oprofile-y				:= $(DRIVER_OBJS) init.o backtrace.o
+oprofile-y :=	$(DRIVER_OBJS) init.o backtrace.o hwsampler.o