summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-10-19 17:23:57 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2006-12-04 02:00:31 -0500
commitbd01f843c3368dcee735c19603251669f23f4477 (patch)
tree3cb848f5577ff7c7cbb21982d81fa4baabc6a7b5
parenta1f8e7f7fb9d7e2cbcb53170edca7c0ac4680697 (diff)
[PATCH] severing skbuff.h -> poll.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/compat.c1
-rw-r--r--fs/gfs2/locking/dlm/plock.c1
-rw-r--r--include/linux/skbuff.h1
-rw-r--r--include/net/inet_connection_sock.h1
-rw-r--r--include/net/udp.h1
5 files changed, 4 insertions, 1 deletions
diff --git a/fs/compat.c b/fs/compat.c
index fde52d40c0b..06dad665b88 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -46,6 +46,7 @@
#include <linux/rwsem.h>
#include <linux/tsacct_kern.h>
#include <linux/highmem.h>
+#include <linux/poll.h>
#include <linux/mm.h>
#include <net/sock.h> /* siocdevprivate_ioctl */
diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
index 7365aec9511..3799f19b282 100644
--- a/fs/gfs2/locking/dlm/plock.c
+++ b/fs/gfs2/locking/dlm/plock.c
@@ -8,6 +8,7 @@
#include <linux/miscdevice.h>
#include <linux/lock_dlm_plock.h>
+#include <linux/poll.h>
#include "lock_dlm.h"
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 24ce0add6c5..5c5a08576dc 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -23,7 +23,6 @@
#include <asm/types.h>
#include <linux/spinlock.h>
#include <linux/mm.h>
-#include <linux/poll.h>
#include <linux/net.h>
#include <linux/textsearch.h>
#include <net/checksum.h>
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index cccea051e92..bf16d98d372 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -18,6 +18,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
#include <linux/timer.h>
+#include <linux/poll.h>
#include <net/inet_sock.h>
#include <net/request_sock.h>
diff --git a/include/net/udp.h b/include/net/udp.h
index 1548d68d45d..1b921fa8147 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -29,6 +29,7 @@
#include <net/ip.h>
#include <linux/ipv6.h>
#include <linux/seq_file.h>
+#include <linux/poll.h>
/**
* struct udp_skb_cb - UDP(-Lite) private variables