diff options
| author | David S. Miller | 2015-08-14 01:23:11 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-08-14 01:23:11 +0200 |
| commit | 182ad468e70fc7e8ff2e5d64344c690beaa00ddd (patch) | |
| tree | af0b9b8da89ed03629c71f6829845c301485d289 /drivers/net/ethernet/cavium/Kconfig | |
| parent | documentation: bring vxlan documentation more up-to-date (diff) | |
| parent | Merge tag 'dm-4.2-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/d... (diff) | |
| download | kernel-qcow2-linux-182ad468e70fc7e8ff2e5d64344c690beaa00ddd.tar.gz kernel-qcow2-linux-182ad468e70fc7e8ff2e5d64344c690beaa00ddd.tar.xz kernel-qcow2-linux-182ad468e70fc7e8ff2e5d64344c690beaa00ddd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cavium/Kconfig
The cavium conflict was overlapping dependency
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/cavium/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index 358442087878..9b35d142f47a 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -16,7 +16,6 @@ if NET_VENDOR_CAVIUM config THUNDER_NIC_PF tristate "Thunder Physical function driver" depends on 64BIT - default ARCH_THUNDER select THUNDER_NIC_BGX ---help--- This driver supports Thunder's NIC physical function. @@ -29,14 +28,12 @@ config THUNDER_NIC_PF config THUNDER_NIC_VF tristate "Thunder Virtual function driver" depends on 64BIT - default ARCH_THUNDER ---help--- This driver supports Thunder's NIC virtual function config THUNDER_NIC_BGX tristate "Thunder MAC interface driver (BGX)" depends on 64BIT - default ARCH_THUNDER select PHYLIB select MDIO_OCTEON ---help--- |