Patchwork ARM: imx: iomux-v1.h: Fix build error due to __init annotation

login
register
mail settings
Submitter Fabio Estevam
Date Jan. 5, 2012, 9:33 p.m.
Message ID <1325799188-24921-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/134550/
State New
Headers show

Comments

Fabio Estevam - Jan. 5, 2012, 9:33 p.m.
Fix the following build error found when building imx_v4_v5_defconfig:

  CC      arch/arm/mach-imx/mach-imx27ipcam.o
In file included from arch/arm/plat-mxc/include/mach/iomux-mx27.h:23,
                 from arch/arm/mach-imx/mach-imx27ipcam.c:22:
arch/arm/plat-mxc/include/mach/iomux-v1.h:99: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'imx_iomuxv1_init'

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
This applies against linux-next

 arch/arm/plat-mxc/include/mach/iomux-v1.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Fabio Estevam - Jan. 22, 2012, 3:08 p.m.
Hi Sascha,

On Thu, Jan 5, 2012 at 7:33 PM, Fabio Estevam <festevam@gmail.com> wrote:
> Fix the following build error found when building imx_v4_v5_defconfig:
>
>  CC      arch/arm/mach-imx/mach-imx27ipcam.o
> In file included from arch/arm/plat-mxc/include/mach/iomux-mx27.h:23,
>                 from arch/arm/mach-imx/mach-imx27ipcam.c:22:
> arch/arm/plat-mxc/include/mach/iomux-v1.h:99: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'imx_iomuxv1_init'
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> This applies against linux-next

This is still broken in linux next. Is this patch OK?

Regards,

Fabio Estevam

Patch

diff --git a/arch/arm/plat-mxc/include/mach/iomux-v1.h b/arch/arm/plat-mxc/include/mach/iomux-v1.h
index 6fa8a70..f7d1804 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-v1.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-v1.h
@@ -96,6 +96,6 @@  extern int mxc_gpio_mode(int gpio_mode);
 extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
 		const char *label);
 
-extern int __init imx_iomuxv1_init(void __iomem *base, int numports);
+extern int imx_iomuxv1_init(void __iomem *base, int numports);
 
 #endif /* __MACH_IOMUX_V1_H__ */