diff options
| author | Ben Hutchings | 2011-11-25 15:35:02 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-11-26 20:48:15 +0100 |
| commit | 7df899c36cf09678bdef1824ce591ef4ac0e9864 (patch) | |
| tree | df5d5e8ae7d01d5958432e38ee557ed2d1d154ba /net/dsa/Makefile | |
| parent | dsa: Export functions from core to modules (diff) | |
| download | kernel-qcow2-linux-7df899c36cf09678bdef1824ce591ef4ac0e9864.tar.gz kernel-qcow2-linux-7df899c36cf09678bdef1824ce591ef4ac0e9864.tar.xz kernel-qcow2-linux-7df899c36cf09678bdef1824ce591ef4ac0e9864.zip | |
dsa: Combine core and tagging code
These files have circular dependencies, so if we make DSA modular then
they must 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 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/dsa/Makefile b/net/dsa/Makefile index 2374faff4dea..5431b4a43c13 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -1,13 +1,14 @@ +# the core +obj-$(CONFIG_NET_DSA) += dsa_core.o +dsa_core-y += dsa.o slave.o + # tagging formats -obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o -obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o -obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o +dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o +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 - -# the core -obj-$(CONFIG_NET_DSA) += dsa.o slave.o |