diff options
| author | Anish Bhatt | 2014-09-05 02:12:57 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-09-06 05:47:14 +0200 |
| commit | c99d667e852766afc755fa4430be64bb94e5ea1c (patch) | |
| tree | fc8bac3518d0bbadaf8c5373f1d0432d2a3c87fe /drivers/net/ethernet/broadcom/Kconfig | |
| parent | net: treewide: Fix typo found in DocBook/networking.xml (diff) | |
| download | kernel-qcow2-linux-c99d667e852766afc755fa4430be64bb94e5ea1c.tar.gz kernel-qcow2-linux-c99d667e852766afc755fa4430be64bb94e5ea1c.tar.xz kernel-qcow2-linux-c99d667e852766afc755fa4430be64bb94e5ea1c.zip | |
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 7dcfb19a31c8..d8d07a818b89 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--- |