diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-09 00:46:32 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-09 00:46:32 -0400 |
| commit | d660474e840a8ec5dc770f1a15d44e0045d411a6 (patch) | |
| tree | f9be76e031d9f9996111c8c4d2f3f0011f15ee4b /arch/powerpc/include | |
| parent | 43d795c6320fce4c1b3b38ae764fb465230745ef (diff) | |
| parent | 704102a6799ecf7c1b268a43452761dae335f29c (diff) | |
Merge remote branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/rio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/rio.h b/arch/powerpc/include/asm/rio.h index d902abd33995..b1d2deceeedb 100644 --- a/arch/powerpc/include/asm/rio.h +++ b/arch/powerpc/include/asm/rio.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #define ASM_PPC_RIO_H | 14 | #define ASM_PPC_RIO_H |
| 15 | 15 | ||
| 16 | extern void platform_rio_init(void); | 16 | extern void platform_rio_init(void); |
| 17 | #ifdef CONFIG_RAPIDIO | 17 | #ifdef CONFIG_FSL_RIO |
| 18 | extern int fsl_rio_mcheck_exception(struct pt_regs *); | 18 | extern int fsl_rio_mcheck_exception(struct pt_regs *); |
| 19 | #else | 19 | #else |
| 20 | static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; } | 20 | static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; } |