projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
[platform/kernel/u-boot.git]
/
cpu
/
mpc86xx
/
cpu_init.c
diff --git
a/cpu/mpc86xx/cpu_init.c
b/cpu/mpc86xx/cpu_init.c
index
ab5906d
..
78ba1ea
100644
(file)
--- a/
cpu/mpc86xx/cpu_init.c
+++ b/
cpu/mpc86xx/cpu_init.c
@@
-28,6
+28,7
@@
#include <common.h>
#include <mpc86xx.h>
+#include <asm/fsl_law.h>
DECLARE_GLOBAL_DATA_PTR;
@@
-118,8
+119,5
@@
void cpu_init_f(void)
*/
int cpu_init_r(void)
{
-#ifdef CONFIG_FSL_LAW
- disable_law(0);
-#endif
return 0;
}