summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/dm646x.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-08 00:53:13 +0400
committerArnd Bergmann <arnd@arndb.de>2012-01-08 00:53:13 +0400
commit23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch)
tree60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/mach-davinci/dm646x.c
parente195ffbe4573f79d590e63e2ae32dac2a73d5768 (diff)
parent7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff)
downloadlinux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.xz
Merge branch 'depends/rmk/for-linus' into next/soc
Conflicts: arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c
Diffstat (limited to 'arch/arm/mach-davinci/dm646x.c')
-rw-r--r--arch/arm/mach-davinci/dm646x.c1
1 files changed, 0 insertions, 1 deletions
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)