summaryrefslogtreecommitdiff
path: root/drivers/bcma
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-02-08 08:48:33 +0400
committerDavid S. Miller <davem@davemloft.net>2013-02-08 08:48:33 +0400
commitb285109dde7b873b5dc671ef1b3ae3090f4bc72f (patch)
tree695331432f2d422efa6c71ad3b35b281b17a81c8 /drivers/bcma
parent241448c2b84ff02a46ce88199e05fdeb55bad449 (diff)
parent7e6c63f03d94278135753fef7ffcc5b03e34282e (diff)
downloadlinux-b285109dde7b873b5dc671ef1b3ae3090f4bc72f.tar.xz
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')
0 files changed, 0 insertions, 0 deletions