Merge branch 'fix/kconfig' into for-linus

1 files changed, 1 insertions, 7 deletions

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 436dda1159d2..2761af36d141 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -47,7 +47,7 @@
 #include <linux/string.h>
 #include <asm/uaccess.h>
 #include <linux/interrupt.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/hardirq.h>
 #include <linux/netdevice.h>
 #include <linux/in.h>
@@ -62,12 +62,6 @@ struct tipc_msg;	/* msg.h */
 struct print_buf;       /* log.h */
 
 /*
- * TIPC sanity test macros
- */
-
-#define assert(i)  BUG_ON(!(i))
-
-/*
  * TIPC system monitoring code
  */