From patchwork Wed Nov 9 18:02:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 81543 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp328577qge; Wed, 9 Nov 2016 10:03:21 -0800 (PST) X-Received: by 10.98.166.70 with SMTP id t67mr1464282pfe.132.1478714601507; Wed, 09 Nov 2016 10:03:21 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id es13si501726pac.153.2016.11.09.10.03.21; Wed, 09 Nov 2016 10:03:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754636AbcKISDJ (ORCPT + 27 others); Wed, 9 Nov 2016 13:03:09 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34600 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752778AbcKISC4 (ORCPT ); Wed, 9 Nov 2016 13:02:56 -0500 Received: by mail-pf0-f181.google.com with SMTP id n85so130379568pfi.1 for ; Wed, 09 Nov 2016 10:02:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to; bh=OBGGEnRBIBskQGH+IecAkyPJ13vrmuo9stpDeQ122o8=; b=L4V5VUHOPthehQAImRGQUE1umKc3ttetxQHk95BIerl/GjBiBcdvOH23140pGdXsIe MyYOuh9ETBBgT1T3SaU0hq1pwkJGkawQCjN/R/mpojqztj29hU5gli4iSWxRLXyWnZXE hIw6PJOcUtAJSM6UrFTkfiz22L0czvtjQ+cyQ= 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:in-reply-to :references:in-reply-to; bh=OBGGEnRBIBskQGH+IecAkyPJ13vrmuo9stpDeQ122o8=; b=FOjyQZwCG2NjcE/tsnWtCXnLiRpxK8wET4ddN5CQ06qquwX4rSXOAYKpcSPv/Fgkhs fG3uUveYiMSEJELYFDQNGtgmbtU1nsqAuQtdZjQoqgG2AP2pO7oBYpNbFyEh+EDBhUKd e7y1ygxnfcxT571FkNNTiQ3FRp3o9WpdNXtEW7tJdo6R3CSnxrU28aDwHdl7YKZEICu7 Fu5a5eMdshLactpqlVGCV6APD8Bu+fMV4YRMd7DFNDk+wf6sAm0rqf1mKdJcvRWiMr/H iIa8PfQP41Nb7+hcG94oqyrBk8w0VgFXv7qwDRleHmqAxEW5fyg2VzlxvwvE9+LsqCbd fjfA== X-Gm-Message-State: ABUngvcL7cBx7/z3PNC2UFEkD0Cxv9A7OVhWfRKmbW28owHdXj1JY0bEqw/xj/KeuyO0gHNL X-Received: by 10.98.223.203 with SMTP id d72mr1503803pfl.2.1478714575913; Wed, 09 Nov 2016 10:02:55 -0800 (PST) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id s8sm831884pfj.45.2016.11.09.10.02.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Nov 2016 10:02:55 -0800 (PST) From: Bjorn Andersson To: Andy Gross , Eugene Krasnikov , Kalle Valo Cc: wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] soc: qcom: smem_state: Fix include for ERR_PTR() Date: Wed, 9 Nov 2016 10:02:51 -0800 Message-Id: <1478714571-4841-2-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1478714571-4841-1-git-send-email-bjorn.andersson@linaro.org> References: <1478714571-4841-1-git-send-email-bjorn.andersson@linaro.org> In-Reply-To: <201611092150.OxpAuHow%fengguang.wu@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The correct include file for getting errno constants and ERR_PTR() is linux/err.h, rather than linux/errno.h, so fix the include. Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled smem_state") Signed-off-by: Bjorn Andersson --- Andy, I don't see anything else going into v4.10 for smem_state.h. So if you are okay I would like Kalle to pick this patch through his tree and be able to merge my wcn36xx patches for v4.10. include/linux/soc/qcom/smem_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.5.0 Acked-by: Andy Gross diff --git a/include/linux/soc/qcom/smem_state.h b/include/linux/soc/qcom/smem_state.h index 7b88697929e9..b8478ee7a71f 100644 --- a/include/linux/soc/qcom/smem_state.h +++ b/include/linux/soc/qcom/smem_state.h @@ -1,7 +1,7 @@ #ifndef __QCOM_SMEM_STATE__ #define __QCOM_SMEM_STATE__ -#include +#include struct device_node; struct qcom_smem_state;