projects
/
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://git.denx.de/u-boot-i2c
[kernel/u-boot.git]
/
arch
/
m68k
/
cpu
/
mcf547x_8x
/
cpu_init.c
diff --git
a/arch/m68k/cpu/mcf547x_8x/cpu_init.c
b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
index
a9e3b43
..
c3df831
100644
(file)
--- a/
arch/m68k/cpu/mcf547x_8x/cpu_init.c
+++ b/
arch/m68k/cpu/mcf547x_8x/cpu_init.c
@@
-79,7
+79,7
@@
void cpu_init_f(void)
out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK);
#endif
-#ifdef CONFIG_
FSL_I2C
+#ifdef CONFIG_
SYS_I2C_FSL
out_be16(&gpio->par_feci2cirq,
GPIO_PAR_FECI2CIRQ_SCL | GPIO_PAR_FECI2CIRQ_SDA);
#endif