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 git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[pandora-kernel.git]
/
net
/
atm
/
lec.c
diff --git
a/net/atm/lec.c
b/net/atm/lec.c
index
ba48daa
..
215c9fa
100644
(file)
--- a/
net/atm/lec.c
+++ b/
net/atm/lec.c
@@
-1335,7
+1335,7
@@
static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,
#include <linux/types.h>
#include <linux/timer.h>
#include <linux/param.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <linux/inetdevice.h>
#include <net/route.h>