Merge branch 'master' into for-next

[mirror_ubuntu-kernels.git] / drivers / atm / idt77252.c

diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 47648535afa7e758a1790078577f78d1bc3f9103..1c052127548c4f18575e835591e65b7b2a7e8196 100644 (file)
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -46,7 +46,7 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/byteorder.h>
 
 #ifdef CONFIG_ATM_IDT77252_USE_SUNI