From: Colin Ian King colin.king@canonical.com
This patch has been added to the 4.1 stable tree. If you have any objections, please let us know.
===============
[ Upstream commit 75d7e7d7a8f4966cb8b1da54a1c74fb2a97ae8fc ]
Conditionally declare suspend_data on CONFIG_PM to avoid the following warning when CONFIG_OM is not enabled:
drivers/platform/x86/tc1100-wmi.c:55:27: warning: 'suspend_data' defined but not used [-Wunused-variable]
Signed-off-by: Colin Ian King colin.king@canonical.com Signed-off-by: Darren Hart dvhart@linux.intel.com Signed-off-by: Sasha Levin alexander.levin@microsoft.com --- drivers/platform/x86/tc1100-wmi.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c index e36542564131..e89ac8cd20e8 100644 --- a/drivers/platform/x86/tc1100-wmi.c +++ b/drivers/platform/x86/tc1100-wmi.c @@ -52,7 +52,9 @@ struct tc1100_data { u32 jogdial; };
+#ifdef CONFIG_PM static struct tc1100_data suspend_data; +#endif
/* -------------------------------------------------------------------------- Device Management