summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/sa1100_wdt.c
diff options
context:
space:
mode:
authorJiri Slaby2007-10-19 08:40:25 +0200
committerLinus Torvalds2007-10-19 20:53:41 +0200
commit1977f032722c27ee3730284582fd3991ad9ac81b (patch)
tree00ba5692a697a387399131850c56e01345c7cace /drivers/watchdog/sa1100_wdt.c
parentfs/select, remove unused macros (diff)
downloadkernel-qcow2-linux-1977f032722c27ee3730284582fd3991ad9ac81b.tar.gz
kernel-qcow2-linux-1977f032722c27ee3730284582fd3991ad9ac81b.tar.xz
kernel-qcow2-linux-1977f032722c27ee3730284582fd3991ad9ac81b.zip
remove asm/bitops.h includes
remove asm/bitops.h includes including asm/bitops directly may cause compile errors. don't include it and include linux/bitops instead. next patch will deny including asm header directly. Cc: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog/sa1100_wdt.c')
-rw-r--r--drivers/watchdog/sa1100_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 3475f47aaa45..34a2b3b81800 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -25,13 +25,13 @@
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/init.h>
+#include <linux/bitops.h>
#ifdef CONFIG_ARCH_PXA
#include <asm/arch/pxa-regs.h>
#endif
#include <asm/hardware.h>
-#include <asm/bitops.h>
#include <asm/uaccess.h>
#define OSCR_FREQ CLOCK_TICK_RATE