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 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
irq_alpha.c
diff --git
a/arch/alpha/kernel/irq_alpha.c
b/arch/alpha/kernel/irq_alpha.c
index
cfde865
..
5f77afb
100644
(file)
--- a/
arch/alpha/kernel/irq_alpha.c
+++ b/
arch/alpha/kernel/irq_alpha.c
@@
-10,6
+10,7
@@
#include <asm/machvec.h>
#include <asm/dma.h>
+#include <asm/perf_event.h>
#include "proto.h"
#include "irq_impl.h"
@@
-111,6
+112,8
@@
init_IRQ(void)
wrent(entInt, 0);
alpha_mv.init_irq();
+
+ init_hw_perf_events();
}
/*