tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Olof Johansson 3ff80abc 6540afea

+3 -5
+1 -2
arch/arm/mach-imx/mach-mx21ads.c
··· 304 304 imx21_add_mxc_nand(&mx21ads_nand_board_info); 305 305 306 306 platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); 307 - platform_device_register_full( 308 - (struct platform_device_info *)&mx21ads_cs8900_devinfo); 307 + platform_device_register_full(&mx21ads_cs8900_devinfo); 309 308 } 310 309 311 310 static void __init mx21ads_timer_init(void)
+1 -2
arch/arm/mach-imx/mach-mx51_efikamx.c
··· 284 284 .init = mx51_efikamx_timer_init, 285 285 }; 286 286 287 - MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop") 288 - /* Maintainer: Amit Kucheria <amit.kucheria@linaro.org> */ 287 + MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)") 289 288 .atag_offset = 0x100, 290 289 .map_io = mx51_map_io, 291 290 .init_early = imx51_init_early,
+1 -1
arch/arm/mach-imx/mach-mx51_efikasb.c
··· 280 280 .init = mx51_efikasb_timer_init, 281 281 }; 282 282 283 - MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook") 283 + MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)") 284 284 .atag_offset = 0x100, 285 285 .map_io = mx51_map_io, 286 286 .init_early = imx51_init_early,