hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: i.MX: misc board cleanups 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJPi9EkAAoJEPFlmONMx+ezRTwP/0NUBx67Mgnv22u+3+/0X//R
 tEqRuy+ERDr3HfJSK1APzTeUNutcTWTzO4DTsDMCOh+6aSUBKuQ7drgaOaEFIoYN
 eWXyHxo8P5lglyFtuDNvJ8SgXuxxa+6ZjyLm3/+2yv7klR78stBLrmDIiAauiTRb
 GbUTjRX/GwP9QxEPxJlLneWA63FKWf1GOaopSXESrY7Q6fh1ptXUPRaDtJaSQi1V
 Ed5QV7Y2GSxUX6yJzbRIfllhWCB6LywYmS8efbHdXuPY/gs7EwIM0bOjDe8+iOGv
 e+xpS6YJ7j5/lHxDDWEdf5SC3r5fAYRcZtFigqjCT4xDF7yPUZfu27J5llb4R8MV
 z6aTy7vlBz+SsoAUclAVVGTYIWOy9tIKQAiN3n/VfTn7s53qTXsXKs6Vw5dl+fqp
 9GDnt7LJ8KAfkKKnHyHPciErt0L3WxSTVF5SBge/IfkqOhAJCk540rGkwoKs4+Pm
 0w022B1Yu14PjYiZSs6k3c4SOt/rUQP3whWnKhn4xMifb997Tj6Y6/K1uvvEUNkM
 3ToAWi79LMa10tU8RyhdaCTkCzdK1kcCRMG53vAj3KFqHZZBjdOVaohC+18RwT65
 9x87ux4au3RtBY+g9erjT27SV3x5duP7kB01bAqiOjbUg8BTBTo1lkOnYMULFoBR
 Br9gZHIMwpcCfm/GgfeP
 =c8VO
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Olof Johansson 2012-04-25 11:03:35 -07:00
parent 6540afeae0 33076883bc
commit 3ff80abce7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-imx/mach-mx21ads.c
View File

@ -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)

3
arch/arm/mach-imx/mach-mx51_efikamx.c
View File

@ -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,

2
arch/arm/mach-imx/mach-mx51_efikasb.c
View File

@ -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,