diff options
author | David S. Miller <davem@davemloft.net> | 2016-10-06 20:32:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-06 20:32:05 -0400 |
commit | 00c06ed779bee562603b28b088d7a8143dd2d94f (patch) | |
tree | 3f971f44e4adef3d86103bbe3ba549c96bdcf6ea /drivers/net/ethernet/freescale/fman/fman_mac.h | |
parent | 4c1fad64eff481982349f5795b9c198c532b0f13 (diff) | |
parent | 2fbfadb5436a394b0aad68d21de60fe3eb9c14db (diff) | |
download | op-kernel-dev-00c06ed779bee562603b28b088d7a8143dd2d94f.zip op-kernel-dev-00c06ed779bee562603b28b088d7a8143dd2d94f.tar.gz |
Merge branch 'fman-next' of git://git.freescale.com/ppc/upstream/linux
Madalin Bucur says:
====================
fsl/fman: cleanup and small fixes
This series contains fixes for the DPAA FMan driver.
Adding myself as maintainer of the driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/fman_mac.h')
-rw-r--r-- | drivers/net/ethernet/freescale/fman/fman_mac.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/fman/fman_mac.h b/drivers/net/ethernet/freescale/fman/fman_mac.h index ddf0260..dd6d052 100644 --- a/drivers/net/ethernet/freescale/fman/fman_mac.h +++ b/drivers/net/ethernet/freescale/fman/fman_mac.h @@ -191,10 +191,6 @@ struct fman_mac_params { u16 max_speed; /* A handle to the FM object this port related to */ void *fm; - /* MDIO exceptions interrupt source - not valid for all - * MACs; MUST be set to 0 for MACs that don't have - * mdio-irq, or for polling - */ void *dev_id; /* device cookie used by the exception cbs */ fman_mac_exception_cb *event_cb; /* MDIO Events Callback Routine */ fman_mac_exception_cb *exception_cb;/* Exception Callback Routine */ |