From patchwork Thu Feb 13 03:19:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 3642341 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 E3C25BF13A for ; Thu, 13 Feb 2014 03:22:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 613D820149 for ; Thu, 13 Feb 2014 03:22:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FE71200F4 for ; Thu, 13 Feb 2014 03:22:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751845AbaBMDTy (ORCPT ); Wed, 12 Feb 2014 22:19:54 -0500 Received: from qmta11.emeryville.ca.mail.comcast.net ([76.96.27.211]:55318 "EHLO qmta11.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751417AbaBMDTQ (ORCPT ); Wed, 12 Feb 2014 22:19:16 -0500 Received: from omta16.emeryville.ca.mail.comcast.net ([76.96.30.72]) by qmta11.emeryville.ca.mail.comcast.net with comcast id ReWV1n00D1ZMdJ4ABfKG8V; Thu, 13 Feb 2014 03:19:16 +0000 Received: from mail.gonehiking.org ([50.134.149.16]) by omta16.emeryville.ca.mail.comcast.net with comcast id RfKF1n0050MU7Qa8cfKFEB; Thu, 13 Feb 2014 03:19:16 +0000 Received: from lorien.sisa.samsung.com (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id 8CD6C45EC4; Wed, 12 Feb 2014 20:19:14 -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 2/6] drivers/acpi: fix battery driver compile error when CONFIG_PM_SLEEP is undefined Date: Wed, 12 Feb 2014 20:19:06 -0700 Message-Id: <3983d1980b59ffb8522b0e26e60f8587c554438d.1392250669.git.shuah.kh@samsung.com> 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=1392261556; bh=OFKUcyhIyeyF5OzJrkfaXxBVLGhuVJ9Nrc3I4xK4naA=; h=Received:Received:Received:From:To:Subject:Date:Message-Id: MIME-Version:Content-Type; b=J7Xbr+C6e4+20ry0xD+OkObUo3TQTZdBzcDAxfLMlu2fxJ1Zp7WUE2Xj4U1ZQnHef QRXcLv7aQdZ7oM7Brskj2QHTltgTswjtLQbSEXwkbx8/YgYzcwmRBfjW9/A26HeAjh m3/VGyyQXYgxowoEl/iNnrK0h90quXAYKYoDyukafXjaNOO9El/wizod4EJKE7TPxT RPwewPGDTz/0AGfXhOfcOUqQAAhCENlg5TZ2yptTsiFnTKZiDXYV1zsHe685K2f9eV uM+edz1V6KfVEetWVefDfqZi2/EgWM32/wlFhWvT51WBXW1w2i//U2Z2zvpArOrCG6 aH7LPrLSvlYHA== 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 battery driver defines acpi_battery_resume() when CONFIG_PM_SLEEP is defined. This results in the following compile error when CONFIG_PM_SLEEP is undefined. drivers/acpi/battery.c:847:8: error: ‘acpi_battery_resume’ undeclared here (not in a function) Signed-off-by: Shuah Khan --- drivers/acpi/battery.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 018a428..797a693 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -841,6 +841,8 @@ static int acpi_battery_resume(struct device *dev) acpi_battery_update(battery); return 0; } +#else +#define acpi_battery_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);