projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-block.git]
/
drivers
/
net
/
ibm_newemac
/
core.h
diff --git
a/drivers/net/ibm_newemac/core.h
b/drivers/net/ibm_newemac/core.h
index 5ca70e55b6c51a49509953985e24f92928f02e7e..18d56c6c4238e75673e34c3bdd7c0ec2a55563bb 100644
(file)
--- a/
drivers/net/ibm_newemac/core.h
+++ b/
drivers/net/ibm_newemac/core.h
@@
-190,6
+190,9
@@
struct emac_instance {
struct delayed_work link_work;
int link_polling;
struct delayed_work link_work;
int link_polling;
+ /* GPCS PHY infos */
+ u32 gpcs_address;
+
/* Shared MDIO if any */
u32 mdio_ph;
struct of_device *mdio_dev;
/* Shared MDIO if any */
u32 mdio_ph;
struct of_device *mdio_dev;
@@
-344,6
+347,9
@@
enum {
#endif
#ifdef CONFIG_IBM_NEW_EMAC_RGMII
EMAC_FTR_HAS_RGMII |
#endif
#ifdef CONFIG_IBM_NEW_EMAC_RGMII
EMAC_FTR_HAS_RGMII |
+#endif
+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
+ EMAC_FTR_NO_FLOW_CONTROL_40x |
#endif
EMAC_FTR_460EX_PHY_CLK_FIX |
EMAC_FTR_440EP_PHY_CLK_FIX,
#endif
EMAC_FTR_460EX_PHY_CLK_FIX |
EMAC_FTR_440EP_PHY_CLK_FIX,