| Message ID | 1320883635-17194-4-git-send-email-Kyle.D.Moffett@boeing.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index de170fd..783e25c 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -281,7 +281,6 @@ struct rio_priv { static void __iomem *rio_regs_win; -#ifdef CONFIG_E500 int fsl_rio_mcheck_exception(struct pt_regs *regs) { const struct exception_table_entry *entry; @@ -308,7 +307,6 @@ int fsl_rio_mcheck_exception(struct pt_regs *regs) return 0; } EXPORT_SYMBOL_GPL(fsl_rio_mcheck_exception); -#endif /** * fsl_rio_doorbell_send - Send a MPC85xx doorbell message
The "CONFIG_E500" conditional should be unnecessary. The fsl_rio hardware is only present on MPC85xx (e500/e500mc) anyways, although it should build everywhere for better compile-test coverage. The conditionally-defined fsl_rio_mcheck_exception() function lost its two e500-specific constants in commit 82a9a4809f: powerpc/e500: fix breakage with fsl_rio_mcheck_exception Specifically, the references to SPRN_MCSR and MCSR_BUS_RBERR were moved to an e500-specific file. This patch just removes the unnecessary #ifdef, as the entire file is effectively dead code on non-e500 platforms anyways. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> --- arch/powerpc/sysdev/fsl_rio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)