diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-08 05:48:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-08 05:48:33 +0100 |
| commit | b285109dde7b873b5dc671ef1b3ae3090f4bc72f (patch) | |
| tree | 695331432f2d422efa6c71ad3b35b281b17a81c8 /drivers/bcma/main.c | |
| parent | net: sctp: sctp_auth_make_key_vector: remove duplicate ntohs calls (diff) | |
| parent | tg3: add support for Ethernet core in bcm4785 (diff) | |
| download | linux-b285109dde7b873b5dc671ef1b3ae3090f4bc72f.tar.xz linux-b285109dde7b873b5dc671ef1b3ae3090f4bc72f.zip | |
Merge branch 'tg3'
Attention linux-next maintainer, you will hit a merge conflict between
this merge and the mips tree, the resolution is to preserve the removal
of uses of nvram_geenv() and nvram_parse_macaddr() from the net-next
side.
Hauke Mehrtens says:
====================
These patches are adding support for the Ethernet core found in the
BCM4705/BCM4785 SoC.
This is based on current master of davem/net-next.git.
v4:
* move setting of DMA_RWCTRL_ONE_DMA
v3:
* combined first two patches into one patch
v2:
* use of struct sprom in ssb_gige_get_macaddr() instead of accessing
the nvram directly
* add return value to ssb_gige_get_macaddr()
* try to read the mac address from ssb core before accessing the own
registers.
* fix two checkpatch warnings
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bcma/main.c')
0 files changed, 0 insertions, 0 deletions