projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://www.denx.de/git/u-boot-cfi-flash
[platform/kernel/u-boot.git]
/
include
/
watchdog.h
diff --git
a/include/watchdog.h
b/include/watchdog.h
index
a3a2eea
..
64b59f1
100644
(file)
--- a/
include/watchdog.h
+++ b/
include/watchdog.h
@@
-74,7
+74,7
@@
int init_func_watchdog_reset(void);
/* MPC 8xx */
#if defined(CONFIG_8xx) && !defined(__ASSEMBLY__)
- void reset_8xx_watchdog(
volatile immap_t
*immr);
+ void reset_8xx_watchdog(
immap_t __iomem
*immr);
#endif
#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__)