diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-11-26 09:16:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-26 17:10:44 -0500 |
| commit | b3422a314c27d2189c05b69cc1654b71315d3d21 (patch) | |
| tree | 9e292cd89f014f6627a4bf9d0f462413e1857f21 /drivers/net/dsa/Kconfig | |
| parent | 53d6841d225b93c20d561878637c3cd307c11648 (diff) | |
| download | blackbird-op-linux-b3422a314c27d2189c05b69cc1654b71315d3d21.tar.gz blackbird-op-linux-b3422a314c27d2189c05b69cc1654b71315d3d21.zip | |
dsa: Hide core config options; make drivers select what they need
Commit 82167cb8c6b2f8166d5c7532e5ef4b5e0cc46a72 ('net: dsa/slave: Fix
compilation warnings') fixed one possible invalid configuration
(NET_DSA enabled with no trailer formats) but added others: drivers
can select NET_DSA without its dependencies being met.
It's not very useful to make either the DSA core or the tagging
formats manually selectable without a driver to use them, so:
1. Define a hidden HAVE_NET_DSA option and move the dependencies of
NET_DSA to that. While we're at it, drop the deprecated
EXPERIMENTAL dependency.
2. Make NET_DSA and the drivers dependent on HAVE_NET_DSA.
3. Hide the tagging format options again.
4. Make drivers select both NET_DSA and the appropriate tagging format
option.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/Kconfig')
| -rw-r--r-- | drivers/net/dsa/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index 96eae22f612b..b8fe808b7957 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -1,4 +1,5 @@ menu "Distributed Switch Architecture drivers" + depends on HAVE_NET_DSA config NET_DSA_MV88E6XXX tristate @@ -6,6 +7,7 @@ config NET_DSA_MV88E6XXX config NET_DSA_MV88E6060 tristate "Marvell 88E6060 ethernet switch chip support" + select NET_DSA select NET_DSA_TAG_TRAILER ---help--- This enables support for the Marvell 88E6060 ethernet switch @@ -17,6 +19,7 @@ config NET_DSA_MV88E6XXX_NEED_PPU config NET_DSA_MV88E6131 tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support" + select NET_DSA select NET_DSA_MV88E6XXX select NET_DSA_MV88E6XXX_NEED_PPU select NET_DSA_TAG_DSA @@ -26,6 +29,7 @@ config NET_DSA_MV88E6131 config NET_DSA_MV88E6123_61_65 tristate "Marvell 88E6123/6161/6165 ethernet switch chip support" + select NET_DSA select NET_DSA_MV88E6XXX select NET_DSA_TAG_EDSA ---help--- |
