diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2011-11-25 09:36:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:48:15 -0500 |
| commit | 98e673080bd90b9338428be92dd3597798aac3ed (patch) | |
| tree | aea557e2596565fae249712ba652cf6e36e7def5 /net/dsa/Makefile | |
| parent | 7df899c36cf09678bdef1824ce591ef4ac0e9864 (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/Makefile')
| -rw-r--r-- | net/dsa/Makefile | 7 |
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 | |||
| 8 | dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o | 8 | dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o |
| 9 | 9 | ||
| 10 | # switch drivers | 10 | # switch drivers |
| 11 | obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o | ||
| 12 | obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o | 11 | obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o |
| 13 | obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o | 12 | obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx_drv.o |
| 14 | obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o | 13 | mv88e6xxx_drv-y += mv88e6xxx.o |
| 14 | mv88e6xxx_drv-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o | ||
| 15 | mv88e6xxx_drv-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o | ||