powerpc/msi: Fix compile error on mpc83xx
authorHongtao Jia <hongtao.jia@freescale.com>
Tue, 2 Jul 2013 01:36:37 +0000 (09:36 +0800)
committerScott Wood <scottwood@freescale.com>
Wed, 7 Aug 2013 23:38:04 +0000 (18:38 -0500)
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 <hongtao.jia@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
arch/powerpc/include/asm/mpic.h

index 4a1ac9fbf18697035d346b96b2ead190abf58cb9..754f93d208fa62b084e9887db006dc461973c68d 100644 (file)
@@ -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