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 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
Makefile
diff --git
a/arch/alpha/kernel/Makefile
b/arch/alpha/kernel/Makefile
index
5a62fb4
..
1ee9b5b
100644
(file)
--- a/
arch/alpha/kernel/Makefile
+++ b/
arch/alpha/kernel/Makefile
@@
-15,6
+15,7
@@
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_PCI) += pci.o pci_iommu.o pci-sysfs.o
obj-$(CONFIG_SRM_ENV) += srm_env.o
obj-$(CONFIG_MODULES) += module.o
+obj-$(CONFIG_PERF_EVENTS) += perf_event.o
ifdef CONFIG_ALPHA_GENERIC