diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-24 08:51:39 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-24 08:51:39 +0400 |
| commit | db404e72bb5432c886ff0ea42e7b31d16be0c837 (patch) | |
| tree | 91cf9618fa0b5233115abe6863d2f8a36390c050 /arch/arm/mach-vt8500/include/mach/restart.h | |
| parent | 40169a7c399346281da55ed9905a104d3da47945 (diff) | |
| parent | e9a91de7602a0a6999f23a2981db68b69aa695a7 (diff) | |
| download | linux-db404e72bb5432c886ff0ea42e7b31d16be0c837.tar.xz | |
Merge tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code into next/dt
From Tony Prisk:
Update arch-vt8500 and drivers to device tree and
remove existing non-dt code.
* tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code:
arm: vt8500: Update arch-vt8500 to devicetree support.
arm: vt8500: gpio: Devicetree support for arch-vt8500
arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
arm: vt8500: clk: Add Common Clock Framework support
video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
serial: vt8500: Add devicetree support for vt8500-serial
rtc: vt8500: Add devicetree support for vt8500-rtc
arm: vt8500: Add device tree files for VIA/Wondermedia SoC's
Resolved add/change conflict in drivers/clk/Makefile.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-vt8500/include/mach/restart.h')
| -rw-r--r-- | arch/arm/mach-vt8500/include/mach/restart.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-vt8500/include/mach/restart.h b/arch/arm/mach-vt8500/include/mach/restart.h index 89f9b787d2a0..738979518acb 100644 --- a/arch/arm/mach-vt8500/include/mach/restart.h +++ b/arch/arm/mach-vt8500/include/mach/restart.h @@ -13,5 +13,5 @@ * */ -void wmt_setup_restart(void); -void wmt_restart(char mode, const char *cmd); +void vt8500_setup_restart(void); +void vt8500_restart(char mode, const char *cmd); |