| Message ID | 1478714571-4841-2-git-send-email-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kalle Valo |
| Headers | show |
On 9 November 2016 at 12:02, Bjorn Andersson <bjorn.andersson@linaro.org> wrote: > 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 <bjorn.andersson@linaro.org> > --- > > 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(-) > > 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 <linux/errno.h> > +#include <linux/err.h> > > struct device_node; > struct qcom_smem_state; > -- > 2.5.0 > This time with less html. Acked-by: Andy Gross <andy.gross@linaro.org>
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 <linux/errno.h> +#include <linux/err.h> struct device_node; struct qcom_smem_state;
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 <bjorn.andersson@linaro.org> --- 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(-)