From patchwork Thu Feb 13 03:19:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 3642181 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 2144DBF13A for ; Thu, 13 Feb 2014 03:20:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E08F20165 for ; Thu, 13 Feb 2014 03:20:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E24C201BA for ; Thu, 13 Feb 2014 03:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751435AbaBMDT5 (ORCPT ); Wed, 12 Feb 2014 22:19:57 -0500 Received: from qmta03.emeryville.ca.mail.comcast.net ([76.96.30.32]:56470 "EHLO qmta03.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751462AbaBMDTR (ORCPT ); Wed, 12 Feb 2014 22:19:17 -0500 Received: from omta22.emeryville.ca.mail.comcast.net ([76.96.30.89]) by qmta03.emeryville.ca.mail.comcast.net with comcast id Re6P1n00G1vN32cA3fKH1t; Thu, 13 Feb 2014 03:19:17 +0000 Received: from mail.gonehiking.org ([50.134.149.16]) by omta22.emeryville.ca.mail.comcast.net with comcast id RfKF1n00W0MU7Qa8ifKGWu; 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 938FF40229; Wed, 12 Feb 2014 20:19:15 -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 3/6] drivers/acpi: fix button driver compile error when CONFIG_PM_SLEEP is undefined Date: Wed, 12 Feb 2014 20:19:07 -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=1392261557; bh=LJ69ltepZ661p9/caVDn9p4IdzQI/UBTjo4XbtbEdHU=; h=Received:Received:Received:From:To:Subject:Date:Message-Id: MIME-Version:Content-Type; b=ibzuwiniDex+gj84je8P1516rNgJnu1C6VAHFlwU1ygKsHvKQ866JOrF2dtq3UQTg wmT+uAZ58xxMezm/Z2nkMHKqQtnk9V8/5MsiLxstHYA4hKOQUwa2JJ/en6txYP5dpp L0jW6Wrc/TM3vZtnde5Jx+Tid4OaJuHQh0vzPchvKGz9c/gkDQLMTaat96wvdbziFN SK1uVLitMqhSJWawhOGMxwcusoedc53lSOqlCRGbLfdbff5xwXQ0NCdNUKeZKlbswR 6PT3sTa9O83XTI+YnJ+tlOgGQXlPSYA21F5PWx/LLWiK3pbwia1yw196ls63SA+4QY ap8zduzv1FGQw== 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 button driver defines acpi_button_resume() when CONFIG_PM_SLEEP is defined. This results in the following compile error when CONFIG_PM_SLEEP is undefined. drivers/acpi/button.c:85:8: error: ‘acpi_button_resume’ undeclared here (not in a function) Signed-off-by: Shuah Khan --- drivers/acpi/button.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 11c11f6..714e957 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -80,6 +80,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event); #ifdef CONFIG_PM_SLEEP static int acpi_button_resume(struct device *dev); +#else +#define acpi_button_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);