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

Commit 7334219c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: fix i2c init order on ap325rxa V2
  sh: fix i2c init order on Migo-R V2
  sh: convert processor device setup functions to arch_initcall()
parents e6949583 dbefd606

arch/sh/boards/board-ap325rxa.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -547,7 +547,7 @@ static int __init ap325rxa_devices_setup(void) 
	return platform_add_devices(ap325rxa_devices,

	return platform_add_devices(ap325rxa_devices,

				ARRAY_SIZE(ap325rxa_devices));

				ARRAY_SIZE(ap325rxa_devices));

}

}

device_initcall(ap325rxa_devices_setup);

arch_initcall(ap325rxa_devices_setup);





/* Return the board specific boot mode pin configuration */

/* Return the board specific boot mode pin configuration */

static int ap325rxa_mode_pins(void)

static int ap325rxa_mode_pins(void)

arch/sh/boards/mach-migor/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -608,7 +608,7 @@ static int __init migor_devices_setup(void) 




	return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices));

	return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices));

}

}

__initcall(migor_devices_setup);

arch_initcall(migor_devices_setup);





/* Return the board specific boot mode pin configuration */

/* Return the board specific boot mode pin configuration */

static int migor_mode_pins(void)

static int migor_mode_pins(void)

arch/sh/kernel/cpu/sh2/setup-sh7619.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ static int __init sh7619_devices_setup(void) 
	return platform_add_devices(sh7619_devices,

	return platform_add_devices(sh7619_devices,

				    ARRAY_SIZE(sh7619_devices));

				    ARRAY_SIZE(sh7619_devices));

}

}

__initcall(sh7619_devices_setup);

arch_initcall(sh7619_devices_setup);





void __init plat_irq_setup(void)

void __init plat_irq_setup(void)

{

{

arch/sh/kernel/cpu/sh2a/setup-mxg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -238,7 +238,7 @@ static int __init mxg_devices_setup(void) 
	return platform_add_devices(mxg_devices,

	return platform_add_devices(mxg_devices,

				    ARRAY_SIZE(mxg_devices));

				    ARRAY_SIZE(mxg_devices));

}

}

__initcall(mxg_devices_setup);

arch_initcall(mxg_devices_setup);





void __init plat_irq_setup(void)

void __init plat_irq_setup(void)

{

{

arch/sh/kernel/cpu/sh2a/setup-sh7201.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -357,7 +357,7 @@ static int __init sh7201_devices_setup(void) 
	return platform_add_devices(sh7201_devices,

	return platform_add_devices(sh7201_devices,

				    ARRAY_SIZE(sh7201_devices));

				    ARRAY_SIZE(sh7201_devices));

}

}

__initcall(sh7201_devices_setup);

arch_initcall(sh7201_devices_setup);





void __init plat_irq_setup(void)

void __init plat_irq_setup(void)

{

{