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
/
firestream.c
diff --git
a/drivers/atm/firestream.c
b/drivers/atm/firestream.c
index
7c7b571
..
5072f8a
100644
(file)
--- a/
drivers/atm/firestream.c
+++ b/
drivers/atm/firestream.c
@@
-52,7
+52,7
@@
#include <asm/system.h>
#include <asm/string.h>
#include <asm/io.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/uaccess.h>
#include <linux/wait.h>