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/kernel/machvec.c | |
parent | Merge branch 'sh/clkfwk' (diff) | |
parent | sh: Ensure active regions have a backing PMB entry. (diff) | |
download | linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.tar.xz linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.zip |
Merge branch 'sh/lmb'
Conflicts:
arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/kernel/machvec.c')
-rw-r--r-- | arch/sh/kernel/machvec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c index 1652340ba3f2..85cfaf916fdc 100644 --- a/arch/sh/kernel/machvec.c +++ b/arch/sh/kernel/machvec.c @@ -131,6 +131,7 @@ void __init sh_mv_setup(void) mv_set(ioport_unmap); mv_set(irq_demux); mv_set(mode_pins); + mv_set(mem_init); if (!sh_mv.mv_nr_irqs) sh_mv.mv_nr_irqs = NR_IRQS; |