summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-06-02 11:18:53 -0500
committerKumar Gala <galak@kernel.crashing.org>2011-06-02 15:29:08 -0500
commita3623239ad941c7fa5440231f601e8f6de1f2a54 (patch)
tree06549dc702d556af5b08881ef8bb983635191f5d /arch/powerpc
parent9693ebd4815eefa2b7c8fcc699061a0c8da0c1e7 (diff)
downloadop-kernel-dev-a3623239ad941c7fa5440231f601e8f6de1f2a54.zip
op-kernel-dev-a3623239ad941c7fa5440231f601e8f6de1f2a54.tar.gz
powerpc/fsl_rio: Fix compile error when CONFIG_FSL_RIO not set
arch/powerpc/kernel/built-in.o: In function `machine_check_e500mc': arch/powerpc/kernel/traps.c:429: undefined reference to `fsl_rio_mcheck_exception' arch/powerpc/kernel/built-in.o: In function `machine_check_e500': arch/powerpc/kernel/traps.c:519: undefined reference to `fsl_rio_mcheck_exception' make: *** [.tmp_vmlinux1] Error 1 Reported-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/rio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/rio.h b/arch/powerpc/include/asm/rio.h
index d902abd..b1d2dec 100644
--- a/arch/powerpc/include/asm/rio.h
+++ b/arch/powerpc/include/asm/rio.h
@@ -14,7 +14,7 @@
#define ASM_PPC_RIO_H
extern void platform_rio_init(void);
-#ifdef CONFIG_RAPIDIO
+#ifdef CONFIG_FSL_RIO
extern int fsl_rio_mcheck_exception(struct pt_regs *);
#else
static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; }
OpenPOWER on IntegriCloud