git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
oprofile
/
Makefile
diff --git
a/arch/s390/oprofile/Makefile
b/arch/s390/oprofile/Makefile
index 496e4a7ee00eb99a7d885acd4b7aff2c97eb4058..e9dd41b0b8d332f3ef9a2ca58ed7f0f869fef818 100644
(file)
--- a/
arch/s390/oprofile/Makefile
+++ b/
arch/s390/oprofile/Makefile
@@
-7,4
+7,3
@@
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
timer_int.o )
oprofile-y := $(DRIVER_OBJS) init.o
-oprofile-y += hwsampler.o