Merge "power: reset: fix build error for "force_warm_reboot" flag" (3bd6bd5b) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/power/reset/msm-poweroff.c

+2 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -57,6 +57,7 @@ static bool scm_deassert_ps_hold_supported;
		static void __iomem *msm_ps_hold;
		static phys_addr_t tcsr_boot_misc_detect;
		static void scm_disable_sdi(void);
		static bool force_warm_reboot;

		#ifdef CONFIG_QCOM_DLOAD_MODE
		/* Runtime could be only changed value once.
		@@ -87,8 +88,6 @@ static bool scm_dload_supported;
		static struct kobject dload_kobj;
		static void *dload_type_addr;

		static bool force_warm_reboot;

		static int dload_set(const char val, const struct kernel_param kp);
		/* interface for exporting attributes */
		struct reset_attribute {