projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
freescale
/
fman
/
fman_mac.h
diff --git
a/drivers/net/ethernet/freescale/fman/fman_mac.h
b/drivers/net/ethernet/freescale/fman/fman_mac.h
index
ddf0260
..
dd6d052
100644
(file)
--- 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;
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 */
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 */