diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2011-11-25 14:38:38 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:48:16 -0500 |
| commit | 34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6 (patch) | |
| tree | 8646a156a13e68babdc8daa85bec607c68bc7800 /net/dsa/Makefile | |
| parent | 3d825ede8c79a4799a6a3c34719551c7c1908b96 (diff) | |
| download | linux-34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6.tar.gz linux-34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6.tar.bz2 linux-34a430d7bd26b35ca3a7d3fc83663de8ea6e33f6.zip | |
dsa: Allow core and drivers to be built as modules
Change the kconfig types to tristate and adjust the condition for
declaring net_device::dsa_ptr to allow for this.
Adjust the makefile so that if NET_DSA_MV88E6123_61_65=y and
NET_DSA_MV88E6131=m or vice versa then both drivers are built-in. We
could leave these options as bool and make NET_DSA_MV88E6XXX a
user-selected option, but that would break existing configurations.
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 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/dsa/Makefile b/net/dsa/Makefile index 5c48ac556997..191dd482e557 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -11,5 +11,9 @@ dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.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 +ifdef CONFIG_NET_DSA_MV88E6123_61_65 +mv88e6xxx_drv-y += mv88e6123_61_65.o +endif +ifdef CONFIG_NET_DSA_MV88E6131 +mv88e6xxx_drv-y += mv88e6131.o +endif |