projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-samsung-board-v3.1' into next-samsung-board
[linux-2.6-microblaze.git]
/
arch
/
mn10300
/
mm
/
misalignment.c
diff --git
a/arch/mn10300/mm/misalignment.c
b/arch/mn10300/mm/misalignment.c
index
eef989c
..
f9bb8cb
100644
(file)
--- a/
arch/mn10300/mm/misalignment.c
+++ b/
arch/mn10300/mm/misalignment.c
@@
-26,7
+26,7
@@
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/smp.h>
#include <asm/pgalloc.h>
#include <asm/cpu-regs.h>