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
/
net
/
atlx
/
atl1.c
diff --git
a/drivers/net/atlx/atl1.c
b/drivers/net/atlx/atl1.c
index
c346e65
..
9f3e530
100644
(file)
--- a/
drivers/net/atlx/atl1.c
+++ b/
drivers/net/atlx/atl1.c
@@
-44,7
+44,7
@@
* SMP torture testing
*/
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>