diff options
author | Jiri Pirko <jiri@resnulli.us> | 2015-03-16 07:33:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-16 16:29:18 -0400 |
commit | bd76a116707bd2381da36cf7c3183df11293f1d6 (patch) | |
tree | 79fbf9e849bda88cf56fcb42c229af3d72bf5be0 /drivers/net/dsa | |
parent | 73ee5442978b2dd3159e0170b09ba907a197a62d (diff) |
dsa: change "select" to "depends on" for NET_SWITCHDEV and for NET_DSA
This would fix randconfig compile error:
net/built-in.o: In function `netdev_switch_fib_ipv4_abort':
(.text+0xf7811): undefined reference to `fib_flush_external'
Also it fixes following warnings:
warning: (NET_DSA) selects NET_SWITCHDEV which has unmet direct dependencies (NET && INET)
warning: (NET_DSA_MV88E6060 && NET_DSA_MV88E6131 && NET_DSA_MV88E6123_61_65 && NET_DSA_MV88E6171 && NET_DSA_MV88E6352 && NET_DSA_BCM_SF2) selects NET_DSA which has unmet direct dependencies (NET && HAVE_NET_DSA && NET_SWITCHDEV)
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Suggested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
-rw-r--r-- | drivers/net/dsa/Kconfig | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index 48e62a34f7f2..18550c7ebe6f 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig | |||
@@ -7,7 +7,7 @@ config NET_DSA_MV88E6XXX | |||
7 | 7 | ||
8 | config NET_DSA_MV88E6060 | 8 | config NET_DSA_MV88E6060 |
9 | tristate "Marvell 88E6060 ethernet switch chip support" | 9 | tristate "Marvell 88E6060 ethernet switch chip support" |
10 | select NET_DSA | 10 | depends on NET_DSA |
11 | select NET_DSA_TAG_TRAILER | 11 | select NET_DSA_TAG_TRAILER |
12 | ---help--- | 12 | ---help--- |
13 | This enables support for the Marvell 88E6060 ethernet switch | 13 | This enables support for the Marvell 88E6060 ethernet switch |
@@ -19,7 +19,7 @@ config NET_DSA_MV88E6XXX_NEED_PPU | |||
19 | 19 | ||
20 | config NET_DSA_MV88E6131 | 20 | config NET_DSA_MV88E6131 |
21 | tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support" | 21 | tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support" |
22 | select NET_DSA | 22 | depends on NET_DSA |
23 | select NET_DSA_MV88E6XXX | 23 | select NET_DSA_MV88E6XXX |
24 | select NET_DSA_MV88E6XXX_NEED_PPU | 24 | select NET_DSA_MV88E6XXX_NEED_PPU |
25 | select NET_DSA_TAG_DSA | 25 | select NET_DSA_TAG_DSA |
@@ -29,7 +29,7 @@ config NET_DSA_MV88E6131 | |||
29 | 29 | ||
30 | config NET_DSA_MV88E6123_61_65 | 30 | config NET_DSA_MV88E6123_61_65 |
31 | tristate "Marvell 88E6123/6161/6165 ethernet switch chip support" | 31 | tristate "Marvell 88E6123/6161/6165 ethernet switch chip support" |
32 | select NET_DSA | 32 | depends on NET_DSA |
33 | select NET_DSA_MV88E6XXX | 33 | select NET_DSA_MV88E6XXX |
34 | select NET_DSA_TAG_EDSA | 34 | select NET_DSA_TAG_EDSA |
35 | ---help--- | 35 | ---help--- |
@@ -38,7 +38,7 @@ config NET_DSA_MV88E6123_61_65 | |||
38 | 38 | ||
39 | config NET_DSA_MV88E6171 | 39 | config NET_DSA_MV88E6171 |
40 | tristate "Marvell 88E6171/6172 ethernet switch chip support" | 40 | tristate "Marvell 88E6171/6172 ethernet switch chip support" |
41 | select NET_DSA | 41 | depends on NET_DSA |
42 | select NET_DSA_MV88E6XXX | 42 | select NET_DSA_MV88E6XXX |
43 | select NET_DSA_TAG_EDSA | 43 | select NET_DSA_TAG_EDSA |
44 | ---help--- | 44 | ---help--- |
@@ -47,7 +47,7 @@ config NET_DSA_MV88E6171 | |||
47 | 47 | ||
48 | config NET_DSA_MV88E6352 | 48 | config NET_DSA_MV88E6352 |
49 | tristate "Marvell 88E6176/88E6352 ethernet switch chip support" | 49 | tristate "Marvell 88E6176/88E6352 ethernet switch chip support" |
50 | select NET_DSA | 50 | depends on NET_DSA |
51 | select NET_DSA_MV88E6XXX | 51 | select NET_DSA_MV88E6XXX |
52 | select NET_DSA_TAG_EDSA | 52 | select NET_DSA_TAG_EDSA |
53 | ---help--- | 53 | ---help--- |
@@ -56,8 +56,7 @@ config NET_DSA_MV88E6352 | |||
56 | 56 | ||
57 | config NET_DSA_BCM_SF2 | 57 | config NET_DSA_BCM_SF2 |
58 | tristate "Broadcom Starfighter 2 Ethernet switch support" | 58 | tristate "Broadcom Starfighter 2 Ethernet switch support" |
59 | depends on HAS_IOMEM | 59 | depends on HAS_IOMEM && NET_DSA |
60 | select NET_DSA | ||
61 | select NET_DSA_TAG_BRCM | 60 | select NET_DSA_TAG_BRCM |
62 | select FIXED_PHY | 61 | select FIXED_PHY |
63 | select BCM7XXX_PHY | 62 | select BCM7XXX_PHY |