From 9e375c2b06b2f1250c3507bb2ce0d32dbbf573e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Tue, 8 May 2012 09:20:21 +0200 Subject: [PATCH] --- yaml --- r: 303439 b: refs/heads/master c: f5c85d922c8407315d6a5b100ddb89db26938914 h: refs/heads/master i: 303437: c4cee78382eb7e327de627a395c6d6958d9ea681 303435: 619e1a969b20587a7cc9fec5349f1b01daf99858 303431: aa6c1e0eb3fd173bbf2625955d7e4488de243efe 303423: d869c7f5c9ed1b4d80406f0166629b1db6b51e94 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 1 + trunk/arch/arm/mach-imx/mach-cpuimx51sd.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cfb447b23ab9..5ca5a48ab048 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a88da8905ff43f84d4f0e20233467bc8e42433cb +refs/heads/master: f5c85d922c8407315d6a5b100ddb89db26938914 diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 2f824d81030b..96b1c771c784 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -691,6 +691,7 @@ config MACH_EUKREA_CPUIMX51SD select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART + select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_MXC_EHCI select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_SPI_IMX diff --git a/trunk/arch/arm/mach-imx/mach-cpuimx51sd.c b/trunk/arch/arm/mach-imx/mach-cpuimx51sd.c index 9fbe923c8b08..3e1d9fe1508b 100644 --- a/trunk/arch/arm/mach-imx/mach-cpuimx51sd.c +++ b/trunk/arch/arm/mach-imx/mach-cpuimx51sd.c @@ -272,6 +272,7 @@ static void __init eukrea_cpuimx51sd_init(void) imx51_add_imx_uart(0, &uart_pdata); imx51_add_mxc_nand(&eukrea_cpuimx51sd_nand_board_info); + imx51_add_imx2_wdt(0, NULL); gpio_request(ETH_RST, "eth_rst"); gpio_set_value(ETH_RST, 1);