projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[cascardo/linux.git]
/
arch
/
s390
/
oprofile
/
Makefile
diff --git
a/arch/s390/oprofile/Makefile
b/arch/s390/oprofile/Makefile
index
537b2d8
..
524c4b6
100644
(file)
--- a/
arch/s390/oprofile/Makefile
+++ b/
arch/s390/oprofile/Makefile
@@
-6,4
+6,5
@@
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
+oprofile-$(CONFIG_64BIT) += hwsampler.o