diff options
| author | Herbert Xu | 2018-08-03 11:55:12 +0200 |
|---|---|---|
| committer | Herbert Xu | 2018-08-03 11:55:12 +0200 |
| commit | c5f5aeef9b55b362ad5a0e04e4b41cd63b208842 (patch) | |
| tree | 0ee2bb561e879db0a990d998359f6516dff3393b /drivers/net/ethernet/amd | |
| parent | crypto: rmd320 - use swap macro in rmd320_transform (diff) | |
| parent | crypto/arm64: aes-ce-gcm - add missing kernel_neon_begin/end pair (diff) | |
| download | kernel-qcow2-linux-c5f5aeef9b55b362ad5a0e04e4b41cd63b208842.tar.gz kernel-qcow2-linux-c5f5aeef9b55b362ad5a0e04e4b41cd63b208842.tar.xz kernel-qcow2-linux-c5f5aeef9b55b362ad5a0e04e4b41cd63b208842.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").
Diffstat (limited to 'drivers/net/ethernet/amd')
| -rw-r--r-- | drivers/net/ethernet/amd/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig index d5c15e8bb3de..9e5cf5583c87 100644 --- a/drivers/net/ethernet/amd/Kconfig +++ b/drivers/net/ethernet/amd/Kconfig @@ -44,7 +44,7 @@ config AMD8111_ETH config LANCE tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" - depends on ISA && ISA_DMA_API && !ARM + depends on ISA && ISA_DMA_API && !ARM && !PPC32 ---help--- If you have a network (Ethernet) card of this type, say Y here. Some LinkSys cards are of this type. @@ -138,7 +138,7 @@ config PCMCIA_NMCLAN config NI65 tristate "NI6510 support" - depends on ISA && ISA_DMA_API && !ARM + depends on ISA && ISA_DMA_API && !ARM && !PPC32 ---help--- If you have a network (Ethernet) card of this type, say Y here. @@ -173,7 +173,7 @@ config SUNLANCE config AMD_XGBE tristate "AMD 10GbE Ethernet driver" - depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM && HAS_DMA + depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM depends on X86 || ARM64 || COMPILE_TEST select BITREVERSE select CRC32 |