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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
net
/
atm
/
atm_misc.c
diff --git
a/net/atm/atm_misc.c
b/net/atm/atm_misc.c
index
fc63526
..
f41f026
100644
(file)
--- a/
net/atm/atm_misc.c
+++ b/
net/atm/atm_misc.c
@@
-9,7
+9,7
@@
#include <linux/sonet.h>
#include <linux/bitops.h>
#include <linux/errno.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
int atm_charge(struct atm_vcc *vcc, int truesize)
{