Merge tag 'pm+acpi-3.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[cascardo/linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 7da10b8..e411046 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -238,12 +238,12 @@ config XPS
        depends on SMP
        default y
 
-config NETPRIO_CGROUP
+config CGROUP_NET_PRIO
        tristate "Network priority cgroup"
        depends on CGROUPS
        ---help---
          Cgroup subsystem for use in assigning processes to network priorities on
-         a per-interface basis
+         a per-interface basis.
 
 config CGROUP_NET_CLASSID
        boolean "Network classid cgroup"