diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 09:51:37 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 09:51:37 +0300 |
commit | b20e82939034a79e9af50853d63163fe21f205a9 (patch) | |
tree | 7cfcf453c08e9b7e00530cfedc043eea23b0f367 /drivers/net/ethernet/broadcom/Kconfig | |
parent | f7514a6630166a7b566dee9b1af2e87e431959be (diff) | |
parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
download | linux-b20e82939034a79e9af50853d63163fe21f205a9.tar.xz |
Merge 5.12-rc6 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 f8a168b73307..cb88ffb8f12f 100644 --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -54,7 +54,7 @@ config B44_PCI config BCM4908_ENET tristate "Broadcom BCM4908 internal mac support" depends on ARCH_BCM4908 || COMPILE_TEST - default y + default y if ARCH_BCM4908 help This driver supports Ethernet controller integrated into Broadcom BCM4908 family SoCs. |