diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-25 20:03:35 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-25 20:03:35 +0200 |
| commit | 3ff80abce7d0d3c1eacda53e73c94a57ade2e0a5 (patch) | |
| tree | dea7dce54513969b9f6094b928aca536762007a1 /arch/arm/mach-imx | |
| parent | Merge tag 'at91-3.5-cleanup' of git://github.com/at91linux/linux-at91 into ne... (diff) | |
| parent | ARM: i.MX: efikamx: match machine descriptions with legacy (diff) | |
| download | linux-3ff80abce7d0d3c1eacda53e73c94a57ade2e0a5.tar.xz linux-3ff80abce7d0d3c1eacda53e73c94a57ade2e0a5.zip | |
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
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx21ads.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-mx51_efikamx.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-mx51_efikasb.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index e432d4acee1f..d14bbe949a4f 100644 --- a/arch/arm/mach-imx/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c @@ -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) diff --git a/arch/arm/mach-imx/mach-mx51_efikamx.c b/arch/arm/mach-imx/mach-mx51_efikamx.c index 586e9f822124..86e96ef11f9d 100644 --- a/arch/arm/mach-imx/mach-mx51_efikamx.c +++ b/arch/arm/mach-imx/mach-mx51_efikamx.c @@ -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, diff --git a/arch/arm/mach-imx/mach-mx51_efikasb.c b/arch/arm/mach-imx/mach-mx51_efikasb.c index 24aded9e109f..88f837a6cc76 100644 --- a/arch/arm/mach-imx/mach-mx51_efikasb.c +++ b/arch/arm/mach-imx/mach-mx51_efikasb.c @@ -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, |