diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 03:09:18 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 03:09:18 +0200 |
| commit | f444fea7896dbc267249d27f604082a51b8efca2 (patch) | |
| tree | d72e809d28ff7a1cb02f648c858d106de1be859d /drivers/ptp | |
| parent | octeontx2-af: remove redudant second error check on variable err (diff) | |
| parent | Merge tag 'net-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-f444fea7896dbc267249d27f604082a51b8efca2.tar.xz linux-f444fea7896dbc267249d27f604082a51b8efca2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/ptp/Kconfig:
55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/ptp')
| -rw-r--r-- | drivers/ptp/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index 8ad88c3e79aa..32660dc11354 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -103,7 +103,8 @@ config PTP_1588_CLOCK_INES config PTP_1588_CLOCK_PCH tristate "Intel PCH EG20T as PTP clock" depends on X86_32 || COMPILE_TEST - depends on HAS_IOMEM && NET + depends on HAS_IOMEM && PCI + depends on NET depends on PTP_1588_CLOCK help This driver adds support for using the PCH EG20T as a PTP |