X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fwatchdog%2Fsa1100_wdt.c;h=d985cba40dde99421ac19f09fffb1d6ba03f7fae;hb=be509729356b7433f73df2b9a966674a437fbbc1;hp=3475f47aaa45766cc48f3cf7361683ddfede5aee;hpb=b7e04f8c61a46d742de23af5d7ca2b41b33e40ac;p=linux-2.6

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 3475f47aaa..d985cba40d 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/arch/hardware.h>
 #include <asm/uaccess.h>
 
 #define OSCR_FREQ		CLOCK_TICK_RATE