git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
asm
/
mach-au1x00
/
au1xxx_eth.h
diff --git
a/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
b/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
index bae9b758fcde85bb3b8ebd1298480cc642b38af6..49dc8d9db186fec5b1ab279243785391839428fa 100644
(file)
--- a/
arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
+++ b/
arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
@@
-9,6
+9,7
@@
struct au1000_eth_platform_data {
int phy_addr;
int phy_busid;
int phy_irq;
+ char mac[6];
};
void __init au1xxx_override_eth_cfg(unsigned port,