aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa/mv88e6xxx.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-11-25 09:36:19 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-26 14:48:15 -0500
commit98e673080bd90b9338428be92dd3597798aac3ed (patch)
treeaea557e2596565fae249712ba652cf6e36e7def5 /net/dsa/mv88e6xxx.h
parent7df899c36cf09678bdef1824ce591ef4ac0e9864 (diff)
mv88e6xxx: Combine mv88e6131 and mv88e612_61_65 drivers
These drivers share a lot of code, so if we make them modular they should be built into the same module. Therefore, link them together and merge their respective module init and exit functions. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/mv88e6xxx.h')
-rw-r--r--net/dsa/mv88e6xxx.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/dsa/mv88e6xxx.h b/net/dsa/mv88e6xxx.h
index 61156ca26a0d..fc2cd7b90e8d 100644
--- a/net/dsa/mv88e6xxx.h
+++ b/net/dsa/mv88e6xxx.h
@@ -71,6 +71,9 @@ void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds,
71 int nr_stats, struct mv88e6xxx_hw_stat *stats, 71 int nr_stats, struct mv88e6xxx_hw_stat *stats,
72 int port, uint64_t *data); 72 int port, uint64_t *data);
73 73
74extern struct dsa_switch_driver mv88e6131_switch_driver;
75extern struct dsa_switch_driver mv88e6123_61_65_switch_driver;
76
74#define REG_READ(addr, reg) \ 77#define REG_READ(addr, reg) \
75 ({ \ 78 ({ \
76 int __ret; \ 79 int __ret; \