Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index e411046a62e3f0fe82281bc6b97dd8a1183558d1..d92afe4204d9c4f55be1017abde876f90c54fde9 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
@@ -239,7 +243,7 @@ config XPS
        default y
 
 config CGROUP_NET_PRIO
-       tristate "Network priority cgroup"
+       bool "Network priority cgroup"
        depends on CGROUPS
        ---help---
          Cgroup subsystem for use in assigning processes to network priorities on