From 92f13cd6bd7dd3a700d01ffa5efdfef93476272e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Aug 2020 09:18:23 +0200 Subject: [PATCH] Revert "ANDROID: disable 2 ethernet drivers from arm32 build" This reverts commit b276502e1b84a996dd02effb3bdae6428461ca2e as the "correct" fix for one driver is already merged and another one already submitted. Signed-off-by: Greg Kroah-Hartman Change-Id: I1db77d2388903e18b2649719b17adbc5b2287ac3 --- drivers/net/ethernet/aquantia/Kconfig | 2 +- drivers/net/ethernet/sfc/Kconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/aquantia/Kconfig b/drivers/net/ethernet/aquantia/Kconfig index aa9a5eec5174..efb33c078a3c 100644 --- a/drivers/net/ethernet/aquantia/Kconfig +++ b/drivers/net/ethernet/aquantia/Kconfig @@ -19,7 +19,7 @@ if NET_VENDOR_AQUANTIA config AQTION tristate "aQuantia AQtion(tm) Support" depends on PCI - depends on X86_64 || ARM64 + depends on X86_64 || ARM64 || COMPILE_TEST depends on MACSEC || MACSEC=n help This enables the support for the aQuantia AQtion(tm) Ethernet card. diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index 8efd1c27d1a1..5e37c8313725 100644 --- a/drivers/net/ethernet/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -19,7 +19,6 @@ if NET_VENDOR_SOLARFLARE config SFC tristate "Solarflare SFC9000/SFC9100/EF100-family support" depends on PCI - depends on X86_64 || ARM64 select MDIO select CRC32 imply PTP_1588_CLOCK