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-vpr200.c | |
| parent | a26361a77edc724492558a458af6c19cf821ab87 (diff) | |
| parent | bec31a85f0f83567ed4b77e0cd6399bac2f0f037 (diff) | |
| download | talos-op-linux-0508c8e7d47bb64a13cb5d080c4520fe90880b18.tar.gz talos-op-linux-0508c8e7d47bb64a13cb5d080c4520fe90880b18.zip | |
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-vpr200.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-vpr200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c index add8c69c6c1a..b26209d4bcef 100644 --- a/arch/arm/mach-imx/mach-vpr200.c +++ b/arch/arm/mach-imx/mach-vpr200.c @@ -272,7 +272,7 @@ static void __init vpr200_board_init(void) mxc_iomux_v3_setup_multiple_pads(vpr200_pads, ARRAY_SIZE(vpr200_pads)); imx35_add_fec(NULL); - imx35_add_imx2_wdt(NULL); + imx35_add_imx2_wdt(); imx_add_gpio_keys(&vpr200_gpio_keys_data); platform_add_devices(devices, ARRAY_SIZE(devices)); |
