Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / include / net / llc.h

diff --git a/include/net/llc.h b/include/net/llc.h
index 5503b74ab170326ae34236ed8f8ffb9065d0e196..226c846cab08bdf84e0991aee83124c42e6aab0d 100644 (file)
--- a/include/net/llc.h
+++ b/include/net/llc.h
@@ -20,7 +20,7 @@
 #include <linux/hash.h>
 #include <linux/jhash.h>
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 struct net_device;
 struct packet_type;