Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / include / rdma / ib_sa.h

diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index 1082afaed15878aff3e37317501377f96604b746..d44a56388a3e40aa39b982c3b7d56d808abd5da7 100644 (file)
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -38,7 +38,7 @@
 #include <linux/completion.h>
 #include <linux/compiler.h>
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_mad.h>