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 git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
cpu_setup_fsl_booke.S
diff --git
a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index
5c518ad
..
9136111
100644
(file)
--- a/
arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/
arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@
-64,7
+64,7
@@
_GLOBAL(__setup_cpu_e500v2)
bl __e500_icache_setup
bl __e500_dcache_setup
bl __setup_e500_ivors
-#ifdef CONFIG_
RAPID
IO
+#ifdef CONFIG_
FSL_R
IO
/* Ensure that RFXE is set */
mfspr r3,SPRN_HID1
oris r3,r3,HID1_RFXE@h