diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 04:48:05 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 04:48:05 -0400 |
| commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a (patch) | |
| tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/kernel/machvec.c | |
| parent | c5eb5b372e7ea18a5eeb6b5192a6369967cb1afe (diff) | |
| parent | 21823259a70b7a2a21eea1d48c25a6f38896dd11 (diff) | |
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) | |||
| 131 | mv_set(ioport_unmap); | 131 | mv_set(ioport_unmap); |
| 132 | mv_set(irq_demux); | 132 | mv_set(irq_demux); |
| 133 | mv_set(mode_pins); | 133 | mv_set(mode_pins); |
| 134 | mv_set(mem_init); | ||
| 134 | 135 | ||
| 135 | if (!sh_mv.mv_nr_irqs) | 136 | if (!sh_mv.mv_nr_irqs) |
| 136 | sh_mv.mv_nr_irqs = NR_IRQS; | 137 | sh_mv.mv_nr_irqs = NR_IRQS; |