diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-20 19:00:44 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-20 19:00:44 -0500 |
| commit | 50f4df4e6a7ae111fd9b8fada4155675a4410e99 (patch) | |
| tree | a174a42f1f38660d0c4d3c4e81e5bb1e14fab0d1 /arch/powerpc/sysdev | |
| parent | 12fcdba1b7ae8b25696433f420b775aeb556d89b (diff) | |
| parent | b49d81ded47e9d01f7128fce50d224ccc2150960 (diff) | |
Merge remote branch 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_rio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index 9f99bef2adec..8c6cab013278 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c | |||
| @@ -1555,8 +1555,6 @@ int fsl_rio_setup(struct platform_device *dev) | |||
| 1555 | saved_mcheck_exception = ppc_md.machine_check_exception; | 1555 | saved_mcheck_exception = ppc_md.machine_check_exception; |
| 1556 | ppc_md.machine_check_exception = fsl_rio_mcheck_exception; | 1556 | ppc_md.machine_check_exception = fsl_rio_mcheck_exception; |
| 1557 | #endif | 1557 | #endif |
| 1558 | /* Ensure that RFXE is set */ | ||
| 1559 | mtspr(SPRN_HID1, (mfspr(SPRN_HID1) | 0x20000)); | ||
| 1560 | 1558 | ||
| 1561 | return 0; | 1559 | return 0; |
| 1562 | err: | 1560 | err: |