git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git]
/
arch
/
arm
/
oprofile
/
Makefile
diff --git
a/arch/arm/oprofile/Makefile
b/arch/arm/oprofile/Makefile
index
e666eaf
..
b2215c6
100644
(file)
--- a/
arch/arm/oprofile/Makefile
+++ b/
arch/arm/oprofile/Makefile
@@
-6,4
+6,8
@@
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
oprofilefs.o oprofile_stats.o \
timer_int.o )
+ifeq ($(CONFIG_HW_PERF_EVENTS),y)
+DRIVER_OBJS += $(addprefix ../../../drivers/oprofile/, oprofile_perf.o)
+endif
+
oprofile-y := $(DRIVER_OBJS) common.o