diff options
| author | Hongtao Jia <hongtao.jia@freescale.com> | 2013-07-02 09:36:37 +0800 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-08-07 18:38:04 -0500 |
| commit | df1024ad87286c5935d4ebb5153bf4cebf45eb8a (patch) | |
| tree | a0cec64f725187808f1720b9995a09dd9f62ae12 | |
| parent | 3c83658ca989962eed6cd6639ff6c5eeb1ba1e3c (diff) | |
| download | talos-obmc-linux-df1024ad87286c5935d4ebb5153bf4cebf45eb8a.tar.gz talos-obmc-linux-df1024ad87286c5935d4ebb5153bf4cebf45eb8a.zip | |
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 <hongtao.jia@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
| -rw-r--r-- | arch/powerpc/include/asm/mpic.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index 4a1ac9fbf186..754f93d208fa 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 |
