lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:
	arch/sh/kernel/vmlinux.lds.S
This commit is contained in:
Paul Mundt
2009-09-16 13:48:32 +09:00
parent a6f15ade97 0cb583fd28
commit ea88023b34
3897 changed files with 316200 additions and 138946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sh/include/asm/sh_eth.h
View File

@@ -6,6 +6,9 @@ enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};
struct sh_eth_plat_data {
int phy;
int edmac_endian;
unsigned no_ether_link:1;
unsigned ether_link_active_low:1;
};
#endif