summaryrefslogtreecommitdiff
path: root/net/dsa/Makefile
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-11-25 18:36:19 +0400
committerDavid S. Miller <davem@davemloft.net>2011-11-26 23:48:15 +0400
commit98e673080bd90b9338428be92dd3597798aac3ed (patch)
treeaea557e2596565fae249712ba652cf6e36e7def5 /net/dsa/Makefile
parent7df899c36cf09678bdef1824ce591ef4ac0e9864 (diff)
downloadlinux-98e673080bd90b9338428be92dd3597798aac3ed.tar.xz
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/Makefile')
-rw-r--r--net/dsa/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/dsa/Makefile b/net/dsa/Makefile
index 5431b4a43c13..5c48ac556997 100644
--- a/net/dsa/Makefile
+++ b/net/dsa/Makefile
@@ -8,7 +8,8 @@ dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
# switch drivers
-obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
-obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
+obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx_drv.o
+mv88e6xxx_drv-y += mv88e6xxx.o
+mv88e6xxx_drv-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
+mv88e6xxx_drv-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o