summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-05-27 08:48:47 -0400
committerTom Rini <trini@konsulko.com>2022-05-27 08:48:47 -0400
commit0fdc468b069b09bf176fe0255f3ef88f88ef3be0 (patch)
tree6d64f247c0585aab38adf27f6b164493f569cdef /drivers
parent661f5400754750df4104b6466942c8b62897340d (diff)
parentd64ac8549d97cfc37bd629a60f0d502bcd3ee9c7 (diff)
Merge branch '2022-05-26-assorted-fixes'
- Fixes for pytest timeout in CI, missing dependency on PCI for the e1000 driver, fix for CVE-2022-30767 (NFS), TI K3 AM642 DTS bugfix, MAINTAINERS updates, mksquashfs version check fix.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7fe0e00649c..84d859c21eb 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -231,6 +231,7 @@ config DWC_ETH_QOS_TEGRA186
config E1000
bool "Intel PRO/1000 Gigabit Ethernet support"
+ depends on PCI
help
This driver supports Intel(R) PRO/1000 gigabit ethernet family of
adapters. For more information on how to identify your adapter, go