From c6121ddd1f75278ab77504af2914d07831558672 Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Mon, 5 Dec 2011 11:29:46 +0100 Subject: ARM: 7190/1: restart: davinci: use new restart hook Rather than using DaVinci specific davinci_soc_info based restart hook, use the restart hook available in the machine descriptor instead. Tested on DM365 and AM18x EVMs. v2: Changed to use restart hook in machine descriptor per Russell's comment. Signed-off-by: Sekhar Nori Signed-off-by: Russell King --- arch/arm/mach-davinci/dm646x.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-davinci/dm646x.c') diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index af27c130595f..00f774394b16 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -854,7 +854,6 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { .emac_pdata = &dm646x_emac_pdata, .sram_dma = 0x10010000, .sram_len = SZ_32K, - .reset_device = &davinci_wdt_device, }; void __init dm646x_init_mcasp0(struct snd_platform_data *pdata) -- cgit v1.2.1