projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
Makefile
diff --git
a/arch/arm/mach-omap2/Makefile
b/arch/arm/mach-omap2/Makefile
index 7d6abda3b74e7d2bd16abc4c5e49d71bbf5a4505..fe40d9e488c96cdf1c68ba1d6dd7acc9631b360b 100644
(file)
--- a/
arch/arm/mach-omap2/Makefile
+++ b/
arch/arm/mach-omap2/Makefile
@@
-179,6
+179,7
@@
obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
# EMU peripherals
obj-$(CONFIG_OMAP3_EMU) += emu.o
+obj-$(CONFIG_HW_PERF_EVENTS) += pmu.o
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
mailbox_mach-objs := mailbox.o