diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2014-06-05 00:53:02 +0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-05 00:53:02 +0400 |
commit | f8647b506d7116a1a3accd8d618184096e85f50b (patch) | |
tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 /drivers/ptp/Kconfig | |
parent | 1d421ca9d7edbac1eb118631ee039d50ab54771e (diff) | |
parent | f7a89f1b8eb598ac5da61c9795b3d847baa73d12 (diff) | |
download | linux-f8647b506d7116a1a3accd8d618184096e85f50b.tar.xz |
Merge branch '3.15-fixes' into mips-for-linux-next
Diffstat (limited to 'drivers/ptp/Kconfig')
-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 6963bdf54175..6aea373547f6 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -6,6 +6,7 @@ menu "PTP clock support" config PTP_1588_CLOCK tristate "PTP clock support" + depends on NET select PPS select NET_PTP_CLASSIFY help @@ -74,7 +75,7 @@ config DP83640_PHY config PTP_1588_CLOCK_PCH tristate "Intel PCH EG20T as PTP clock" depends on X86 || COMPILE_TEST - depends on HAS_IOMEM + depends on HAS_IOMEM && NET select PTP_1588_CLOCK help This driver adds support for using the PCH EG20T as a PTP |