diff options
| author | Greg Kroah-Hartman | 2013-07-29 21:30:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-07-29 21:30:13 +0200 |
| commit | b78b6b3a9af239549ea863e085223d1d4f65a608 (patch) | |
| tree | fb55713cba98edd270df2c54a7590a2be7e1be10 /arch/arm64/kernel/process.c | |
| parent | net: ieee802154: convert class code to use dev_groups (diff) | |
| parent | Linux 3.11-rc3 (diff) | |
| download | kernel-qcow2-linux-b78b6b3a9af239549ea863e085223d1d4f65a608.tar.gz kernel-qcow2-linux-b78b6b3a9af239549ea863e085223d1d4f65a608.tar.xz kernel-qcow2-linux-b78b6b3a9af239549ea863e085223d1d4f65a608.zip | |
Merge 3.11-rc3 into driver-core-next
We want these fixes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/kernel/process.c')
| -rw-r--r-- | arch/arm64/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 1788bf6b471f..57fb55c44c90 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -81,7 +81,7 @@ void soft_restart(unsigned long addr) void (*pm_power_off)(void); EXPORT_SYMBOL_GPL(pm_power_off); -void (*arm_pm_restart)(char str, const char *cmd); +void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); EXPORT_SYMBOL_GPL(arm_pm_restart); void arch_cpu_idle_prepare(void) |