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 'regmap-linus' into regmap-next
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
traps.c
diff --git
a/arch/parisc/kernel/traps.c
b/arch/parisc/kernel/traps.c
index
8b58bf0
..
f19e660
100644
(file)
--- a/
arch/parisc/kernel/traps.c
+++ b/
arch/parisc/kernel/traps.c
@@
-33,7
+33,7
@@
#include <asm/irq.h>
#include <asm/traps.h>
#include <asm/unaligned.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/smp.h>
#include <asm/pdc.h>
#include <asm/pdc_chassis.h>