Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[cascardo/linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index a83bc4c..d92afe4 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -89,8 +89,12 @@ config NETWORK_SECMARK
          to nfmark, but designated for security purposes.
          If you are unsure how to answer this question, answer N.
 
+config NET_PTP_CLASSIFY
+       def_bool n
+
 config NETWORK_PHY_TIMESTAMPING
        bool "Timestamping in PHY devices"
+       select NET_PTP_CLASSIFY
        help
          This allows timestamping of network packets by PHYs with
          hardware timestamping capabilities. This option adds some