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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcou...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
Makefile
diff --git
a/arch/powerpc/kernel/Makefile
b/arch/powerpc/kernel/Makefile
index
8d1a419
..
7c941ec
100644
(file)
--- a/
arch/powerpc/kernel/Makefile
+++ b/
arch/powerpc/kernel/Makefile
@@
-94,6
+94,7
@@
obj-$(CONFIG_AUDIT) += audit.o
obj64-$(CONFIG_AUDIT) += compat_audit.o
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
+obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o ppc970-pmu.o power6-pmu.o
obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o