diff options
| author | Eliezer Tamir <eliezer.tamir@linux.intel.com> | 2013-07-10 16:13:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-11 02:08:27 +0200 |
| commit | 076bb0c82a44fbe46fe2c8527a5b5b64b69f679d (patch) | |
| tree | c97290b972a4c942bb1e312b67f4a4f22e3670e5 /net/ipv6 | |
| parent | Merge tag 'mmc-updates-for-3.11-rc1' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-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 'net/ipv6')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 5cffa5c3e6b8..345bd92d4ddb 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -63,7 +63,7 @@ #include <net/inet_common.h> #include <net/secure_seq.h> #include <net/tcp_memcontrol.h> -#include <net/ll_poll.h> +#include <net/busy_poll.h> #include <asm/uaccess.h> diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index b6f31437a1f8..40e72034da07 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -46,7 +46,7 @@ #include <net/ip6_checksum.h> #include <net/xfrm.h> #include <net/inet6_hashtables.h> -#include <net/ll_poll.h> +#include <net/busy_poll.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> |