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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
Makefile
diff --git
a/arch/mips/kernel/Makefile
b/arch/mips/kernel/Makefile
index
8088498
..
22b2e0e
100644
(file)
--- a/
arch/mips/kernel/Makefile
+++ b/
arch/mips/kernel/Makefile
@@
-104,4
+104,6
@@
obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT) += 8250-platform.o
obj-$(CONFIG_MIPS_CPUFREQ) += cpufreq/
+obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o
+
CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS)