Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82f81f47 authored by Paul Mundt's avatar Paul Mundt Committed by Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 25f8151b

arch/sh/boards/dreamcast/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static void __init dreamcast_setup(char **cmdline_p) 
#endif

}



struct sh_machine_vector mv_dreamcast __initmv = {

static struct sh_machine_vector mv_dreamcast __initmv = {

	.mv_name		= "Sega Dreamcast",

	.mv_setup		= dreamcast_setup,

	.mv_irq_demux		= systemasic_irq_demux,
@@ -70,4 +70,3 @@ struct sh_machine_vector mv_dreamcast __initmv = { 
	.mv_consistent_free	= dreamcast_consistent_free,

#endif

};
 
ALIAS_MV(dreamcast)

arch/sh/boards/hp6xx/mach.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

arch/sh/boards/hp6xx/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

arch/sh/boards/landisk/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -97,10 +97,9 @@ static void __init landisk_setup(char **cmdline_p) 
/*

 * The Machine Vector

 */

struct sh_machine_vector mv_landisk __initmv = {

static struct sh_machine_vector mv_landisk __initmv = {

	.mv_name = "LANDISK",

	.mv_nr_irqs = 72,

	.mv_setup = landisk_setup,

	.mv_init_irq = init_landisk_IRQ,

};
 
ALIAS_MV(landisk)

arch/sh/boards/lboxre2/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -77,9 +77,8 @@ device_initcall(lboxre2_devices_setup); 
/*

 * The Machine Vector

 */

struct sh_machine_vector mv_lboxre2 __initmv = {

static struct sh_machine_vector mv_lboxre2 __initmv = {

	.mv_name		= "L-BOX RE2",

	.mv_nr_irqs		= 72,

	.mv_init_irq		= init_lboxre2_IRQ,

};
 
ALIAS_MV(lboxre2)