projects
/
firefly-linux-kernel-4.4.55.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/davem/net-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
sfc
/
mcdi.c
diff --git
a/drivers/net/ethernet/sfc/mcdi.c
b/drivers/net/ethernet/sfc/mcdi.c
index d3f307e5c070f8d15538d260336b08d2a251e130..41fb6b60a3f07e11444e0d62430aca937f7e84ea 100644
(file)
--- a/
drivers/net/ethernet/sfc/mcdi.c
+++ b/
drivers/net/ethernet/sfc/mcdi.c
@@
-9,7
+9,7
@@
#include <linux/delay.h>
#include <linux/moduleparam.h>
-#include <
asm/cmpxchg
.h>
+#include <
linux/atomic
.h>
#include "net_driver.h"
#include "nic.h"
#include "io.h"