projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-imx
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
p2041_ids.c
diff --git
a/arch/powerpc/cpu/mpc85xx/p2041_ids.c
b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
index 6e3cdddaed8c4e290c359cc6751932435b774edd..8b6d27452eb17171ad1843074853808617c70e14 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/p2041_ids.c
+++ b/
arch/powerpc/cpu/mpc85xx/p2041_ids.c
@@
-61,7
+61,7
@@
struct liodn_id_table liodn_tbl[] = {
int liodn_tbl_sz = ARRAY_SIZE(liodn_tbl);
#ifdef CONFIG_SYS_DPAA_FMAN
int liodn_tbl_sz = ARRAY_SIZE(liodn_tbl);
#ifdef CONFIG_SYS_DPAA_FMAN
-struct liodn_id_table fman1_liodn_tbl[] = {
+struct
fman_
liodn_id_table fman1_liodn_tbl[] = {
SET_FMAN_RX_1G_LIODN(1, 0, 10),
SET_FMAN_RX_1G_LIODN(1, 1, 11),
SET_FMAN_RX_1G_LIODN(1, 2, 12),
SET_FMAN_RX_1G_LIODN(1, 0, 10),
SET_FMAN_RX_1G_LIODN(1, 1, 11),
SET_FMAN_RX_1G_LIODN(1, 2, 12),