From: Hongtao Jia Date: Tue, 2 Jul 2013 01:36:37 +0000 (+0800) Subject: powerpc/msi: Fix compile error on mpc83xx X-Git-Tag: upstream/snapshot3+hdmi~4413^2~110^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df1024ad87286c5935d4ebb5153bf4cebf45eb8a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git powerpc/msi: Fix compile error on mpc83xx mpic_get_primary_version() is not defined when not using MPIC. The compile error log like: arch/powerpc/sysdev/built-in.o: In function `fsl_of_msi_probe': fsl_msi.c:(.text+0x150c): undefined reference to `fsl_mpic_primary_get_version' Signed-off-by: Jia Hongtao Signed-off-by: Scott Wood --- diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index 4a1ac9f..754f93d 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h @@ -396,7 +396,14 @@ extern struct bus_type mpic_subsys; #define MPIC_REGSET_TSI108 MPIC_REGSET(1) /* Tsi108/109 PIC */ /* Get the version of primary MPIC */ +#ifdef CONFIG_MPIC extern u32 fsl_mpic_primary_get_version(void); +#else +static inline u32 fsl_mpic_primary_get_version(void) +{ + return 0; +} +#endif /* Allocate the controller structure and setup the linux irq descs * for the range if interrupts passed in. No HW initialization is