summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorEliezer Tamir <eliezer.tamir@linux.intel.com>2013-07-10 16:13:17 +0200
committerDavid S. Miller <davem@davemloft.net>2013-07-11 02:08:27 +0200
commit076bb0c82a44fbe46fe2c8527a5b5b64b69f679d (patch)
treec97290b972a4c942bb1e312b67f4a4f22e3670e5 /net/socket.c
parentMerge tag 'mmc-updates-for-3.11-rc1' of git://git.kernel.org/pub/scm/linux/ke... (diff)
downloadlinux-076bb0c82a44fbe46fe2c8527a5b5b64b69f679d.tar.xz
linux-076bb0c82a44fbe46fe2c8527a5b5b64b69f679d.zip
net: rename include/net/ll_poll.h to include/net/busy_poll.h
Rename the file and correct all the places where it is included. Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--net/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 45afa648364a..6a3e9a3f50ad 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -104,7 +104,7 @@
#include <linux/route.h>
#include <linux/sockios.h>
#include <linux/atalk.h>
-#include <net/ll_poll.h>
+#include <net/busy_poll.h>
#ifdef CONFIG_NET_LL_RX_POLL
unsigned int sysctl_net_ll_read __read_mostly;