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 branch 'next'
[platform/kernel/u-boot.git]
/
include
/
mpc8260.h
diff --git
a/include/mpc8260.h
b/include/mpc8260.h
index
9980c74
..
75f1b0c
100644
(file)
--- a/
include/mpc8260.h
+++ b/
include/mpc8260.h
@@
-892,7
+892,7
@@
#define UPMC 3
#if !defined(__ASSEMBLY__) && defined(CONFIG_WATCHDOG)
-
extern
__inline__ void
+
static
__inline__ void
reset_8260_watchdog(volatile immap_t *immr)
{
immr->im_siu_conf.sc_swsr = 0x556c;