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
322dda7
..
64b59f1
100644
(file)
--- a/
include/watchdog.h
+++ b/
include/watchdog.h
@@
-72,9
+72,9
@@
int init_func_watchdog_reset(void);
* Prototypes from $(CPU)/cpu.c.
*/
* Prototypes from $(CPU)/cpu.c.
*/
-/*
AMCC 4
xx */
-#if defined(CONFIG_
4
xx) && !defined(__ASSEMBLY__)
- void reset_
4xx_watchdog(void
);
+/*
MPC 8
xx */
+#if defined(CONFIG_
8
xx) && !defined(__ASSEMBLY__)
+ void reset_
8xx_watchdog(immap_t __iomem *immr
);
#endif
#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__)
#endif
#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__)