From patchwork Sun Feb 23 16:42:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 323344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 21C382C00A8 for ; Mon, 24 Feb 2014 03:42:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751262AbaBWQmM (ORCPT ); Sun, 23 Feb 2014 11:42:12 -0500 Received: from mail-la0-f42.google.com ([209.85.215.42]:48235 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212AbaBWQmL (ORCPT ); Sun, 23 Feb 2014 11:42:11 -0500 Received: by mail-la0-f42.google.com with SMTP id ec20so86161lab.15 for ; Sun, 23 Feb 2014 08:42:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=utAJ7/4P38qjcHQDU3cA5Xu0f7aTjLHWys/CQ9PFNJI=; b=IIqW6qeO5KjEN4z/KcEMZwD6dwtTRmAywexc2s7Q2axM/KU155Rgs0OAjvEdWinxxg c0DGQwUz165dDMbwaVk3CT5oS0BUH/U4FIpp0TF8Jg/YflVSkeAZOKty1t78N+TBoBQH hB2r4k+FPEcMxMg7PS2lzb862qmEcdz7U98JLgwHjaBfjV2d0GWqB2ZbjeIDZV/AzEJ9 CxGBFVU8GAupwbxGEiznuRbU/F+huQciUplmqNpEY3ZQjl1eaa3eXOVO/kWNuOZscVy5 U6IlvtboGbiiQkH9VKRbZLfq0jUrK1epad1H0V13LViKwIpUDTCd+9DUFQf31bxCEzlv h7Pw== X-Gm-Message-State: ALoCoQkZPCPW6hIFkimm42SODsar0Fnb4UvLQkWf3x/yqXPQwpbRYJsBNKse4zmvwE9BdHU6/y7u X-Received: by 10.112.38.4 with SMTP id c4mr4429191lbk.84.1393173730147; Sun, 23 Feb 2014 08:42:10 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id cu8sm15429124lbb.12.2014.02.23.08.42.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Feb 2014 08:42:09 -0800 (PST) From: Ulf Hansson To: Wolfram Sang , linux-i2c@vger.kernel.org Cc: Linus Walleij , Alessandro Rubini , linux-arm-kernel@lists.infradead.org, Ulf Hansson Subject: [PATCH] i2c: nomadik: Silence compiler warning Date: Sun, 23 Feb 2014 17:42:06 +0100 Message-Id: <1393173726-29479-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Commit "i2c: nomadik: Fixup deployment of runtime PM" introduced a compiler warning for !CONFIG_PM. Let's fix it here. Signed-off-by: Ulf Hansson --- Wolfram, currently one of the queued patches for i2c nomadik introduced a compiler warning. I decided to add a fixup patch on top of these instead of you dropping them and me resending new versions of the already applied patches. If you think it's better to drop the queued patches and to resend new verions, please tell me. --- drivers/i2c/busses/i2c-nomadik.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 8082f5c..5f47454 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -895,7 +895,7 @@ static int nmk_i2c_resume_early(struct device *dev) } #endif -#if CONFIG_PM +#ifdef CONFIG_PM static int nmk_i2c_runtime_suspend(struct device *dev) { struct amba_device *adev = to_amba_device(dev);