Merge tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-imx.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 37702491abe98eedd91738408851c56d3a8ea3a5..2b406608a1a4a42606e6ca3eb583f5f1b136176a 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -244,7 +244,7 @@ config NETPRIO_CGROUP
          Cgroup subsystem for use in assigning processes to network priorities on
          a per-interface basis
 
-config NET_LL_RX_POLL
+config NET_RX_BUSY_POLL
        boolean
        default y