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 'master' into for-next
[pandora-kernel.git]
/
drivers
/
atm
/
fore200e.c
diff --git
a/drivers/atm/fore200e.c
b/drivers/atm/fore200e.c
index
bc9e702
..
361f5ae
100644
(file)
--- a/
drivers/atm/fore200e.c
+++ b/
drivers/atm/fore200e.c
@@
-44,7
+44,7
@@
#include <asm/dma.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#ifdef CONFIG_SBUS
#include <linux/of.h>