diff options
author | Thomas Gleixner | 2018-03-14 20:23:25 +0100 |
---|---|---|
committer | Thomas Gleixner | 2018-03-14 20:23:25 +0100 |
commit | 745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c (patch) | |
tree | e556543ed86b7f49e4972d8ea048ff9e46592b4d /arch/x86/platform/intel-mid/intel-mid.c | |
parent | x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms (diff) | |
parent | x86/mm: Fix vmalloc_fault to use pXd_large (diff) | |
download | kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.tar.gz kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.tar.xz kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.zip |
Merge branch 'x86/urgent' into x86/mm to pick up dependencies
Diffstat (limited to 'arch/x86/platform/intel-mid/intel-mid.c')
-rw-r--r-- | arch/x86/platform/intel-mid/intel-mid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c index c556f1e8936e..2ebdf31d9996 100644 --- a/arch/x86/platform/intel-mid/intel-mid.c +++ b/arch/x86/platform/intel-mid/intel-mid.c @@ -79,7 +79,7 @@ static void intel_mid_power_off(void) static void intel_mid_reboot(void) { - intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0); + intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0); } static unsigned long __init intel_mid_calibrate_tsc(void) |