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 branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4a
/
Makefile
diff --git
a/arch/sh/kernel/cpu/sh4a/Makefile
b/arch/sh/kernel/cpu/sh4a/Makefile
index 490d5dc9e3722c6d46914b519e15b71ce6e8bd25..33bab477d2e2de42bbd51a635ab0fb63e82f382c 100644
(file)
--- a/
arch/sh/kernel/cpu/sh4a/Makefile
+++ b/
arch/sh/kernel/cpu/sh4a/Makefile
@@
-44,3
+44,4
@@
pinmux-$(CONFIG_CPU_SUBTYPE_SH7786) := pinmux-sh7786.o
obj-y += $(clock-y)
obj-$(CONFIG_SMP) += $(smp-y)
obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y)
+obj-$(CONFIG_PERF_EVENTS) += perf_event.o