diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/sh/include/asm/sh_eth.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/sh/include/asm/sh_eth.h')
| -rw-r--r-- | arch/sh/include/asm/sh_eth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h index acf99700deed..f739061e2ee4 100644 --- a/arch/sh/include/asm/sh_eth.h +++ b/arch/sh/include/asm/sh_eth.h | |||
| @@ -7,6 +7,7 @@ struct sh_eth_plat_data { | |||
| 7 | int phy; | 7 | int phy; |
| 8 | int edmac_endian; | 8 | int edmac_endian; |
| 9 | 9 | ||
| 10 | unsigned char mac_addr[6]; | ||
| 10 | unsigned no_ether_link:1; | 11 | unsigned no_ether_link:1; |
| 11 | unsigned ether_link_active_low:1; | 12 | unsigned ether_link_active_low:1; |
| 12 | }; | 13 | }; |