Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[karo-tx-linux.git] / include / net / ax25.h

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 206d22297ac36345e5912472cd14ab9c3f51bc10..94e09d361bb1a4c95ae0f60a1375621b7e90261d 100644 (file)
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -11,7 +11,7 @@
 #include <linux/timer.h>
 #include <linux/list.h>
 #include <linux/slab.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #define        AX25_T1CLAMPLO                  1
 #define        AX25_T1CLAMPHI                  (30 * HZ)