Merge branch 'linus' into core/urgent

[firefly-linux-kernel-4.4.55.git] / include / rxrpc / types.h

diff --git a/include/rxrpc/types.h b/include/rxrpc/types.h
index 327a5fc4719cdbebf7efad245dfaca7aa2f02044..30d48f6da2281f0da209ec66f69e062da5f55aa4 100644 (file)
--- a/include/rxrpc/types.h
+++ b/include/rxrpc/types.h
@@ -17,7 +17,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/spinlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 typedef uint32_t       rxrpc_seq_t;    /* Rx message sequence number */
 typedef uint32_t       rxrpc_serial_t; /* Rx message serial number */