diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-17 12:38:41 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-17 12:38:41 (GMT) |
| commit | 8df341cf251f3b77eaaef66f806570e74ab44452 (patch) | |
| tree | 66dacceda331b1ef32772a1b4c63c7f1f4c96d1a /arch/s390/oprofile/Makefile | |
| parent | eb4316dd0a96a74104e5b921e640e73a99b56795 (diff) | |
| parent | ec6b426c4dbb9eef40375c389746cab7e931a584 (diff) | |
| download | linux-8df341cf251f3b77eaaef66f806570e74ab44452.tar.xz | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'arch/s390/oprofile/Makefile')
| -rw-r--r-- | arch/s390/oprofile/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/oprofile/Makefile b/arch/s390/oprofile/Makefile index 537b2d8..d698cdd 100644 --- 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 |