diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2007-05-15 15:19:34 +0900 |
|---|---|---|
| committer |   Paul Mundt <lethal@hera.kernel.org> | 2007-06-08 02:43:39 +0000 |
| commit | 82f81f4784479df17a80caff4a7156da0a2f7dea (patch) | |
| tree | 3679bd23f2c9daa24f9cf3e170a33f851ed45029 /arch/sh/boards/hp6xx | |
| parent | sh: Get multiple boards in one image working again. (diff) | |
| download | linux-dev-82f81f4784479df17a80caff4a7156da0a2f7dea.tar.xz linux-dev-82f81f4784479df17a80caff4a7156da0a2f7dea.zip | |
sh: Kill off machvec aliases.
We now throw all of the machvecs in to .machvec.init and either
select one on the command line, or copy out the first (and
usually only) one to sh_mv. The rest are freed as usual.
This gets rid of all of the silly sh_mv aliasing and makes the
selection explicit rather than link-order dependent.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/hp6xx')
| -rw-r--r-- | arch/sh/boards/hp6xx/mach.c | 4 | ||||
| -rw-r--r-- | arch/sh/boards/hp6xx/setup.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/sh/boards/hp6xx/mach.c b/arch/sh/boards/hp6xx/mach.c index 08dbba910f74..35b895960474 100644 --- a/arch/sh/boards/hp6xx/mach.c +++ b/arch/sh/boards/hp6xx/mach.c @@ -13,7 +13,7 @@ #include <asm/io.h> #include <asm/irq.h> -struct sh_machine_vector mv_hp6xx __initmv = { +static struct sh_machine_vector mv_hp6xx __initmv = { .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM, .mv_inb = hd64461_inb, @@ -42,5 +42,3 @@ struct sh_machine_vector mv_hp6xx __initmv = { .mv_irq_demux = hd64461_irq_demux, }; - -ALIAS_MV(hp6xx) diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c index 6aeee85c9785..7ae708930bac 100644 --- a/arch/sh/boards/hp6xx/setup.c +++ b/arch/sh/boards/hp6xx/setup.c @@ -98,10 +98,9 @@ static void __init hp6xx_setup(char **cmdline_p) } device_initcall(hp6xx_devices_setup); -struct sh_machine_vector mv_hp6xx __initmv = { +static struct sh_machine_vector mv_hp6xx __initmv = { .mv_name = "hp6xx", .mv_setup = hp6xx_setup, .mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM, .mv_irq_demux = hd64461_irq_demux, }; -ALIAS_MV(hp6xx) |