diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /arch/sh/include | |
| parent | a6f15ade97989d414e9bf33874c9d5d1f39808ec (diff) | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/sh_eth.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h index bb832584f3c1..acf99700deed 100644 --- a/arch/sh/include/asm/sh_eth.h +++ b/arch/sh/include/asm/sh_eth.h | |||
| @@ -6,6 +6,9 @@ enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN}; | |||
| 6 | struct sh_eth_plat_data { | 6 | struct sh_eth_plat_data { |
| 7 | int phy; | 7 | int phy; |
| 8 | int edmac_endian; | 8 | int edmac_endian; |
| 9 | |||
| 10 | unsigned no_ether_link:1; | ||
| 11 | unsigned ether_link_active_low:1; | ||
| 9 | }; | 12 | }; |
| 10 | 13 | ||
| 11 | #endif | 14 | #endif |