projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[adm5120] update to 2.6.22-rc6
[openwrt.git]
/
target
/
linux
/
adm5120-2.6
/
files
/
arch
/
mips
/
adm5120
/
adm5120_info.c
diff --git
a/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
b/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
index
87e3d86
..
6d512f1
100644
(file)
--- a/
target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
+++ b/
target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
@@
-206,7
+206,7
@@
static struct adm5120_board __initdata adm5120_boards[] = {
.name = "Infineon EASY 83000",
.mach_type = MACH_ADM5120_EASY83000,
.has_usb = 0,
.name = "Infineon EASY 83000",
.mach_type = MACH_ADM5120_EASY83000,
.has_usb = 0,
- .iface_num =
0
,
+ .iface_num =
6
,
.flash0_size = 4*1024*1024,
},
{
.flash0_size = 4*1024*1024,
},
{
@@
-880,7
+880,8
@@
static void __init adm5120_detect_board(void)
if (t == MACH_ADM5120_UNKNOWN)
t = uboot_detect_board();
} else {
if (t == MACH_ADM5120_UNKNOWN)
t = uboot_detect_board();
} else {
- t = prom_detect_board();
+ if (t == MACH_ADM5120_UNKNOWN)
+ t = prom_detect_board();
}
for (board = adm5120_boards; board->mach_type != MACH_ADM5120_UNKNOWN;
}
for (board = adm5120_boards; board->mach_type != MACH_ADM5120_UNKNOWN;
This page took
0.023104 seconds
and
4
git commands to generate.