diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-14 12:53:42 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 12:53:42 (GMT) |
| commit | b8ce9fb8e18af7466e0b915bb5979322cdace322 (patch) | |
| tree | eec6f9b58ce154fd863f0f78b374a697a5a7139b /arch/powerpc/include/asm/rio.h | |
| parent | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff) | |
| parent | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff) | |
| download | linux-fsl-qoriq-b8ce9fb8e18af7466e0b915bb5979322cdace322.tar.xz | |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'arch/powerpc/include/asm/rio.h')
| -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 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; } |