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 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
perf_event.c
diff --git
a/arch/alpha/kernel/perf_event.c
b/arch/alpha/kernel/perf_event.c
index
8e47709
..
8143cd7
100644
(file)
--- a/
arch/alpha/kernel/perf_event.c
+++ b/
arch/alpha/kernel/perf_event.c
@@
-17,7
+17,7
@@
#include <linux/init.h>
#include <asm/hwrpb.h>
#include <linux/init.h>
#include <asm/hwrpb.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/irq.h>
#include <asm/irq_regs.h>
#include <asm/pal.h>
#include <asm/irq.h>
#include <asm/irq_regs.h>
#include <asm/pal.h>