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://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
drivers
/
net
/
ax88796.c
diff --git
a/drivers/net/ax88796.c
b/drivers/net/ax88796.c
index
39cd101
..
2089141
100644
(file)
--- a/
drivers/net/ax88796.c
+++ b/
drivers/net/ax88796.c
@@
-143,7
+143,7
@@
static void ax88796_mac_read(u8 *buff)
}
}
-int get_prom(u8* mac_addr)
+int get_prom(u8* mac_addr
, u8* base_addr
)
{
u8 prom[32];
int i;