diff options
author | Anish Bhatt <anish@chelsio.com> | 2014-09-04 17:12:57 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-05 20:47:14 -0700 |
commit | c99d667e852766afc755fa4430be64bb94e5ea1c (patch) | |
tree | fc8bac3518d0bbadaf8c5373f1d0432d2a3c87fe /drivers/net/ethernet/broadcom/Kconfig | |
parent | e793c0f70e9bdf4a2e71c151a1a3cf85c4db92ad (diff) | |
download | op-kernel-dev-c99d667e852766afc755fa4430be64bb94e5ea1c.zip op-kernel-dev-c99d667e852766afc755fa4430be64bb94e5ea1c.tar.gz |
cnic : Cleanup CONFIG_IPV6 & VLAN check
The cnic module needs to ensure that if ipv6 support is compiled as a module,
then the cnic module cannot be compiled as built-in as it depends on ipv6.
Made this check cleaner via Kconfig
Use simpler IS_ENABLED for CONFIG_VLAN_8021Q check
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/Kconfig')
-rw-r--r-- | drivers/net/ethernet/broadcom/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig index 7dcfb19..d8d07a8 100644 --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -84,7 +84,7 @@ config BNX2 config CNIC tristate "QLogic CNIC support" - depends on PCI + depends on PCI && (IPV6 || IPV6=n) select BNX2 select UIO ---help--- |