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

Commit 3ff80abc authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 

ARM: i.MX: misc board cleanups

* tag 'arm-imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: i.MX: efikamx: match machine descriptions with legacy
  ARM: imx/mx21ads: remove unneeded cast
parents 6540afea 33076883

arch/arm/mach-imx/mach-mx21ads.c

+1 −2
Original line number Diff line number Diff line
@@ -304,8 +304,7 @@ static void __init mx21ads_board_init(void) 
	imx21_add_mxc_nand(&mx21ads_nand_board_info);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

	platform_device_register_full(

			(struct platform_device_info *)&mx21ads_cs8900_devinfo);

	platform_device_register_full(&mx21ads_cs8900_devinfo);

}



static void __init mx21ads_timer_init(void)

arch/arm/mach-imx/mach-mx51_efikamx.c

+1 −2
Original line number Diff line number Diff line
@@ -284,8 +284,7 @@ static struct sys_timer mx51_efikamx_timer = { 
	.init = mx51_efikamx_timer_init,

};



MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")

	/* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */

MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")

	.atag_offset = 0x100,

	.map_io = mx51_map_io,

	.init_early = imx51_init_early,

arch/arm/mach-imx/mach-mx51_efikasb.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static struct sys_timer mx51_efikasb_timer = { 
	.init	= mx51_efikasb_timer_init,

};



MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")

MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")

	.atag_offset = 0x100,

	.map_io = mx51_map_io,

	.init_early = imx51_init_early,