[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-358-g92a80f0

[Gwenhael Goavec-M. <gwe...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  92a80f04e63cb8c5c741846ea777471034931307 (commit)
      from  5fa854807659a95e92f60366dcb0234f0fedffbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 92a80f04e63cb8c5c741846ea777471034931307
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Thu Aug 8 19:18:52 2013 +0200

    [LINUX][3.11] patch 0206-b: the IS_ENABLED parameter must have CONFIG_

-----------------------------------------------------------------------

Summary of changes:
 ...inctrl-header_conditional_probe_functions.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch b/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
index 9e3df77..197eb1b 100644
--- a/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
+++ b/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
@@ -13,7 +13,7 @@ index bcedd99..446fc01 100644
  #define IMX_MUX_MASK	0x7
  #define IOMUXC_CONFIG_SION	(0x1 << 4)
  
-+#if IS_ENABLED(PINCTRL_IMX)
++#if IS_ENABLED(CONFIG_PINCTRL_IMX)
 +
  int imx_pinctrl_probe(struct platform_device *pdev,
  			struct imx_pinctrl_soc_info *info);


hooks/post-receive
-- 
armadeus