Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client

[karo-tx-linux.git] / drivers / watchdog / sbc7240_wdt.c

diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index ff11504c376e56848f7f7d180c09c69bd3e179b4..93ac58953122c67d55e63a6056b14357d8db8cfb 100644 (file)
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -29,7 +29,7 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/system.h>
 
 #define SBC7240_PREFIX "sbc7240_wdt: "