Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / lib / dec_and_lock.c

diff --git a/lib/dec_and_lock.c b/lib/dec_and_lock.c
index e73822aa6e9a68131df955c0a6025c7aa5556fc6..b5257725daada8a180f7a4b6d1e4288e7afeb059 100644 (file)
--- a/lib/dec_and_lock.c
+++ b/lib/dec_and_lock.c
@@ -1,6 +1,6 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 /*
  * This is an implementation of the notion of "decrement a