diff options
author | David S. Miller <davem@davemloft.net> | 2013-07-22 16:50:38 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-07-22 16:50:38 -0700 |
commit | c3f51d5f387b552b9d9fd7f41e19b84929712f82 (patch) | |
tree | 8d5d903de54a8ab5d31605d5077fa3b5fc8934f7 /include/net/ndisc.h | |
parent | eda297729171fe16bf34fe5b0419dfb69060f623 (diff) | |
parent | 0d9b2ab1c3760a7ca28293c0ae48c2302d71ce96 (diff) |
Merge branch 'fec'
Fabio Estevam says:
====================
This series improves clock handling in the driver by not enabling/disabling
the optional ptp and enet_out clocks unconditionally, check for the return value
of clk_prepare_enable and also handle clk_ptp in suspend/resume.
Remove an unneeded check in platform_get_resource() and also use
devm_request_irq() that can help to simplify the code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Frank Li <lznuaa@gmail.com>
Diffstat (limited to 'include/net/ndisc.h')
0 files changed, 0 insertions, 0 deletions