git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
watchdog
/
ixp2000_wdt.c
diff --git
a/drivers/watchdog/ixp2000_wdt.c
b/drivers/watchdog/ixp2000_wdt.c
index
a77f69d
..
4f4b35a
100644
(file)
--- a/
drivers/watchdog/ixp2000_wdt.c
+++ b/
drivers/watchdog/ixp2000_wdt.c
@@
-26,8
+26,7
@@
#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/uaccess.h>
-
-#include <asm/hardware.h>
+#include <mach/hardware.h>
static int nowayout = WATCHDOG_NOWAYOUT;
static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */