summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/dm355.c
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2011-12-05 11:29:46 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:09 +0000
commitc6121ddd1f75278ab77504af2914d07831558672 (patch)
treec286a1854d96375e2c3e968301087461e12d2138 /arch/arm/mach-davinci/dm355.c
parent3921470527fa2800f575dee376712f2a6584db91 (diff)
downloadlinux-3.10-c6121ddd1f75278ab77504af2914d07831558672.tar.gz
linux-3.10-c6121ddd1f75278ab77504af2914d07831558672.tar.bz2
linux-3.10-c6121ddd1f75278ab77504af2914d07831558672.zip
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 <nsekhar@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-davinci/dm355.c')
-rw-r--r--arch/arm/mach-davinci/dm355.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index fe520d4167a..19667cfc5de 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -853,7 +853,6 @@ static struct davinci_soc_info davinci_soc_info_dm355 = {
.serial_dev = &dm355_serial_device,
.sram_dma = 0x00010000,
.sram_len = SZ_32K,
- .reset_device = &davinci_wdt_device,
};
void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata)