From patchwork Wed Sep 24 15:10:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 4967031 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 84B989F2BB for ; Wed, 24 Sep 2014 15:11:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D14E020103 for ; Wed, 24 Sep 2014 15:11:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E133C201CD for ; Wed, 24 Sep 2014 15:10:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752991AbaIXPKx (ORCPT ); Wed, 24 Sep 2014 11:10:53 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:63523 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752501AbaIXPKw (ORCPT ); Wed, 24 Sep 2014 11:10:52 -0400 Received: by mail-pd0-f180.google.com with SMTP id r10so8625416pdi.25 for ; Wed, 24 Sep 2014 08:10:51 -0700 (PDT) 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=tGWMJo8Qj4Kyxpamm5i5JjtS9pc7QWiNkopH65XNIOk=; b=UVwsVEq5Rp4vY/92iBjf3XVyxHb3g6LOQ8nH2UR6+syouSE14agEU+LYF6wBrPA8+p 0Q9mUyR9wOzGFjsjW7AEP4dkNlXuyfBQuS0AQ1/dXtI2e6O5f4mlTW/PRWBEFnYcMvLV 0mrQuIV1pz4kSQavS8kyYFbOneeGRL7UcP2KqMYXiRuRM9hoNpEjQiAy8Ugsrm7QD/40 AhpIUpP4S5B0VaLXqAKstet+nTVCPUDjZ0UX9Lsl0813mTHw5SJNvoFkTLOF4dRl9o+V kZwv8H/a7pCPBZR0pvWzxjnMq9OmFS2WxUooQU6ewR2hRvtIVwS/LuNfdQCHttAzct0O zcyw== X-Gm-Message-State: ALoCoQn0jm0vOvTQNL3V2AkQvX+8BDG5GomNANgKAY+Uca6nAccLozbsMcPpeJDGFSddUyjFPJ7H X-Received: by 10.66.145.133 with SMTP id su5mr10153311pab.11.1411571451759; Wed, 24 Sep 2014 08:10:51 -0700 (PDT) Received: from localhost.localdomain ([124.73.11.148]) by mx.google.com with ESMTPSA id cz1sm15033917pdb.85.2014.09.24.08.10.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 08:10:50 -0700 (PDT) From: Zhangfei Gao To: Mauro Carvalho Chehab , Fengguang Wu Cc: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, Zhangfei Gao Subject: [PATCH] rc: fix hix5hd2 build issue in 0-DAY kernel build Date: Wed, 24 Sep 2014 23:10:01 +0800 Message-Id: <1411571401-30664-1-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add dependence of ARCH_HIX5HD2 to solve build error in arch like ia64 error: implicit declaration of function 'readl_relaxed' & 'writel_relaxed' Change CONFIG_PM to CONFIG_PM_SLEEP to solve warning: 'hix5hd2_ir_suspend' & 'hix5hd2_ir_resume' defined but not used Reported-by: Fengguang Wu Signed-off-by: Zhangfei Gao --- drivers/media/rc/Kconfig | 2 +- drivers/media/rc/ir-hix5hd2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig index 01e5f7a..ff5a625 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig @@ -166,7 +166,7 @@ config IR_ENE config IR_HIX5HD2 tristate "Hisilicon hix5hd2 IR remote control" - depends on RC_CORE + depends on RC_CORE && ARCH_HIX5HD2 help Say Y here if you want to use hisilicon hix5hd2 remote control. To compile this driver as a module, choose M here: the module will be diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c index 64f8257..c1d8527 100644 --- a/drivers/media/rc/ir-hix5hd2.c +++ b/drivers/media/rc/ir-hix5hd2.c @@ -289,7 +289,7 @@ static int hix5hd2_ir_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int hix5hd2_ir_suspend(struct device *dev) { struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);