git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
include
/
asm
/
machvec.h
diff --git
a/arch/sh/include/asm/machvec.h
b/arch/sh/include/asm/machvec.h
index 9c30955630ffb8882064a53a54c76e9d810af659..bc0218cb72e13992c97602bdc9e2679cdcdea323 100644
(file)
--- a/
arch/sh/include/asm/machvec.h
+++ b/
arch/sh/include/asm/machvec.h
@@
-49,6
+49,8
@@
struct sh_machine_vector {
int (*mv_clk_init)(void);
int (*mv_mode_pins)(void);
+
+ void (*mv_mem_init)(void);
};
extern struct sh_machine_vector sh_mv;