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 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
[pandora-kernel.git]
/
arch
/
mn10300
/
proc-mn2ws0050
/
proc-init.c
diff --git
a/arch/mn10300/proc-mn2ws0050/proc-init.c
b/arch/mn10300/proc-mn2ws0050/proc-init.c
index
c58249b
..
fe6e249
100644
(file)
--- a/
arch/mn10300/proc-mn2ws0050/proc-init.c
+++ b/
arch/mn10300/proc-mn2ws0050/proc-init.c
@@
-18,7
+18,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/busctl-regs.h>