diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:28:33 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:28:33 +0200 |
commit | 0508c8e7d47bb64a13cb5d080c4520fe90880b18 (patch) | |
tree | d9eafb85892d0b2860cff28bc2c06f6c03472204 /arch/arm/mach-imx/mach-mx53_evk.c | |
parent | a26361a77edc724492558a458af6c19cf821ab87 (diff) | |
parent | bec31a85f0f83567ed4b77e0cd6399bac2f0f037 (diff) |
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX cleanups for v3.6
* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: remove unused pdata from device macros
ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
ARM: imx27/dt: make dt_compat entry const
ARM: imx: cleanup otg_mode
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx53_evk.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx53_evk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx53_evk.c b/arch/arm/mach-imx/mach-mx53_evk.c index 5a72188b9cd..a1060b26fb2 100644 --- a/arch/arm/mach-imx/mach-mx53_evk.c +++ b/arch/arm/mach-imx/mach-mx53_evk.c @@ -154,7 +154,7 @@ static void __init mx53_evk_board_init(void) spi_register_board_info(mx53_evk_spi_board_info, ARRAY_SIZE(mx53_evk_spi_board_info)); imx53_add_ecspi(0, &mx53_evk_spi_data); - imx53_add_imx2_wdt(0, NULL); + imx53_add_imx2_wdt(0); gpio_led_register_device(-1, &mx53evk_leds_data); } |