git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
fsl_rio.c
diff --git
a/arch/powerpc/sysdev/fsl_rio.c
b/arch/powerpc/sysdev/fsl_rio.c
index
9f99bef
..
8c6cab0
100644
(file)
--- 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
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:
return 0;
err: