From patchwork Thu Feb 13 03:19:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 3642161 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D8DA1BF40C for ; Thu, 13 Feb 2014 03:19:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1144A201B4 for ; Thu, 13 Feb 2014 03:19:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11B44201BA for ; Thu, 13 Feb 2014 03:19:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752627AbaBMDTy (ORCPT ); Wed, 12 Feb 2014 22:19:54 -0500 Received: from qmta06.emeryville.ca.mail.comcast.net ([76.96.30.56]:34832 "EHLO qmta06.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbaBMDTU (ORCPT ); Wed, 12 Feb 2014 22:19:20 -0500 Received: from omta15.emeryville.ca.mail.comcast.net ([76.96.30.71]) by qmta06.emeryville.ca.mail.comcast.net with comcast id RfBv1n0061Y3wxoA6fKLFi; Thu, 13 Feb 2014 03:19:20 +0000 Received: from mail.gonehiking.org ([50.134.149.16]) by omta15.emeryville.ca.mail.comcast.net with comcast id RfKJ1n00f0MU7Qa8bfKK70; Thu, 13 Feb 2014 03:19:19 +0000 Received: from lorien.sisa.samsung.com (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id A6BAA45EC4; Wed, 12 Feb 2014 20:19:18 -0700 (MST) From: Shuah Khan To: lenb@kernel.org, rjw@rjwysocki.net, rui.zhang@intel.com Cc: Shuah Khan , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, shuahkhan@gmail.com Subject: [PATCH 6/6] drivers/acpi: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined Date: Wed, 12 Feb 2014 20:19:10 -0700 Message-Id: X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1392261560; bh=o7mDb0uCq0mXY46lvU/9wDvk5uw0njiRC233JtCGGJo=; h=Received:Received:Received:From:To:Subject:Date:Message-Id: MIME-Version:Content-Type; b=qrf/6CEj2mMtHAcAQg0QJUYILctYgBbI8kLy2CQyWkRUg7N8aCK43mW0UWmstPnOs IywsJ+DhYDeHOl4tSxLqac3HjW7GjV14XDI6GzD0EG404Ac0SccR1jAGhfAVsEgu4k iIaxJbeb4PXPyng4TAmRJHHle087pFWrNsj63sZlwumunIkfLrW0auLCuPHrzEko9L Ruqc1H/NrFt0R35E0MZBI+siXoXisHYqzsUnQfextagAkBiaY1eHyYj7UvvAYrReup BvuPEBAFbYEVj5acbnJmt5ULsEmhRIH2FrBg5z7wU5sijFv6MBK+0ibLgEjnpUOgjP d+ZaieUvYFl5Q== Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP thermal driver defines acpi_thermal_resume() when CONFIG_PM_SLEEP is defined. This results in the following compile error when CONFIG_PM_SLEEP is undefined. CC drivers/acpi/thermal.o drivers/acpi/thermal.c:107:8: error: ‘acpi_thermal_resume’ undeclared here (not in a function) make[2]: *** [drivers/acpi/thermal.o] Error 1 Signed-off-by: Shuah Khan --- drivers/acpi/thermal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 8349a55..08626c8 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -102,6 +102,8 @@ MODULE_DEVICE_TABLE(acpi, thermal_device_ids); #ifdef CONFIG_PM_SLEEP static int acpi_thermal_resume(struct device *dev); +#else +#define acpi_thermal_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume);