summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/include/mach/tnetv107x.h
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/include/mach/tnetv107x.h
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/include/mach/tnetv107x.h')
-rw-r--r--arch/arm/mach-davinci/include/mach/tnetv107x.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
index 89c1fdc63c0b..83e5926f3c46 100644
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@ -54,6 +54,7 @@ extern struct platform_device tnetv107x_serial_device;
extern void __init tnetv107x_init(void);
extern void __init tnetv107x_devices_init(struct tnetv107x_device_info *);
extern void __init tnetv107x_irq_init(void);
+void tnetv107x_restart(char mode, const char *cmd);
#endif