diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/sh/include/asm/sh_eth.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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 acf99700dee..f739061e2ee 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 | }; |