diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-21 01:00:44 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-21 01:00:44 +0100 |
| commit | 50f4df4e6a7ae111fd9b8fada4155675a4410e99 (patch) | |
| tree | a174a42f1f38660d0c4d3c4e81e5bb1e14fab0d1 /arch/powerpc/sysdev/fsl_rio.c | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | powerpc: fix warning when compiling immap_qe.h (diff) | |
| download | linux-50f4df4e6a7ae111fd9b8fada4155675a4410e99.tar.xz linux-50f4df4e6a7ae111fd9b8fada4155675a4410e99.zip | |
Merge remote branch 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/sysdev/fsl_rio.c')
| -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) saved_mcheck_exception = ppc_md.machine_check_exception; ppc_md.machine_check_exception = fsl_rio_mcheck_exception; #endif - /* Ensure that RFXE is set */ - mtspr(SPRN_HID1, (mfspr(SPRN_HID1) | 0x20000)); return 0; err: |