diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
| commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a (patch) | |
| tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/include/asm/machvec.h | |
| parent | c5eb5b372e7ea18a5eeb6b5192a6369967cb1afe (diff) | |
| parent | 21823259a70b7a2a21eea1d48c25a6f38896dd11 (diff) | |
Merge branch 'sh/lmb'
Conflicts:
arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/include/asm/machvec.h')
| -rw-r--r-- | arch/sh/include/asm/machvec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h index 9c30955630ff..bc0218cb72e1 100644 --- 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; |