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 branch 'topic/maya44' into for-linus
[pandora-kernel.git]
/
drivers
/
watchdog
/
sa1100_wdt.c
diff --git
a/drivers/watchdog/sa1100_wdt.c
b/drivers/watchdog/sa1100_wdt.c
index
5bd782f
..
ee1caae
100644
(file)
--- a/
drivers/watchdog/sa1100_wdt.c
+++ b/
drivers/watchdog/sa1100_wdt.c
@@
-30,7
+30,7
@@
#include <linux/timex.h>
#ifdef CONFIG_ARCH_PXA
-#include <mach/
pxa-regs
.h>
+#include <mach/
regs-ost
.h>
#endif
#include <mach/reset.h>