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

[~andy/linux] / drivers / atm / zatm.c

diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 7f8c5132ff323e901cfeadc5b35987bf6782d5fc..d889f56e8d8cf64cae17fc3bdb4c8ce120afc246 100644 (file)
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -27,7 +27,7 @@
 #include <asm/system.h>
 #include <asm/string.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/uaccess.h>
 
 #include "uPD98401.h"