summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2010-12-31 19:59:29 +0100
committerDavid S. Miller <davem@davemloft.net>2011-01-01 22:57:54 +0100
commit886ef52a8ce6930a9d0c58267d5b5038ac3e8d30 (patch)
tree7cd0019938cc0c52301d206a54556f6a355c2529
parenttipc: Finish streamlining of debugging code (diff)
downloadlinux-886ef52a8ce6930a9d0c58267d5b5038ac3e8d30.tar.xz
linux-886ef52a8ce6930a9d0c58267d5b5038ac3e8d30.zip
tipc: remove redundant #includes
Eliminates a number of #include statements that no longer serve any useful purpose. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/addr.c1
-rw-r--r--net/tipc/bcast.c1
-rw-r--r--net/tipc/bearer.c1
-rw-r--r--net/tipc/config.c1
-rw-r--r--net/tipc/core.c6
-rw-r--r--net/tipc/discover.c2
-rw-r--r--net/tipc/eth_media.c4
-rw-r--r--net/tipc/msg.c1
-rw-r--r--net/tipc/name_distr.c1
-rw-r--r--net/tipc/net.c2
-rw-r--r--net/tipc/node.c1
-rw-r--r--net/tipc/socket.c11
12 files changed, 0 insertions, 32 deletions
diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index 483868a75b88..88463d9a6f12 100644
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@@ -35,7 +35,6 @@
*/
#include "core.h"
-#include "node.h"
#include "addr.h"
/**
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 22a10fadc8c6..c0f3b096e7f5 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -38,7 +38,6 @@
#include "core.h"
#include "link.h"
#include "port.h"
-#include "name_distr.h"
#include "bcast.h"
#define MAX_PKT_DEFAULT_MCAST 1500 /* bcast link max packet size (fixed) */
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 24dc6c2c75ad..040f3ed32ec8 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -37,7 +37,6 @@
#include "core.h"
#include "config.h"
#include "bearer.h"
-#include "port.h"
#include "discover.h"
#define MAX_ADDR_STR 32
diff --git a/net/tipc/config.c b/net/tipc/config.c
index a7894ff77ae9..6c67132f8652 100644
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -36,7 +36,6 @@
#include "core.h"
#include "port.h"
-#include "link.h"
#include "name_table.h"
#include "config.h"
diff --git a/net/tipc/core.c b/net/tipc/core.c
index a02bc490caae..60b85ec6d106 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -34,14 +34,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/random.h>
-
#include "core.h"
#include "ref.h"
-#include "net.h"
#include "name_table.h"
#include "subscr.h"
#include "config.h"
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index e7223789d150..be28f5adc770 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -37,8 +37,6 @@
#include "core.h"
#include "link.h"
#include "discover.h"
-#include "port.h"
-#include "name_table.h"
#define TIPC_LINK_REQ_INIT 125 /* min delay during bearer start up */
#define TIPC_LINK_REQ_FAST 2000 /* normal delay if bearer has no links */
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index ee683cc8f4b1..101d9cb6a559 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -34,10 +34,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/netdevice.h>
-#include <linux/slab.h>
-#include <net/net_namespace.h>
-
#include "core.h"
#include "bearer.h"
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index a029cdc2df6d..2571ffb4d350 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -35,7 +35,6 @@
*/
#include "core.h"
-#include "addr.h"
#include "msg.h"
u32 tipc_msg_tot_importance(struct tipc_msg *m)
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 0dd648ec0809..376a30b9fd72 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -35,7 +35,6 @@
*/
#include "core.h"
-#include "addr.h"
#include "link.h"
#include "name_distr.h"
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 6290becd35be..9bacfd00b91e 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -36,10 +36,8 @@
#include "core.h"
#include "net.h"
-#include "name_table.h"
#include "name_distr.h"
#include "subscr.h"
-#include "link.h"
#include "port.h"
#include "config.h"
diff --git a/net/tipc/node.c b/net/tipc/node.c
index fb54719679a6..126d774883dd 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -37,7 +37,6 @@
#include "core.h"
#include "config.h"
#include "node.h"
-#include "port.h"
#include "name_distr.h"
static void node_lost_contact(struct tipc_node *n_ptr);
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 7a21a5ee43e8..f972c0b4a719 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -34,17 +34,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/net.h>
-#include <linux/socket.h>
-#include <linux/errno.h>
-#include <linux/mm.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/gfp.h>
-#include <asm/string.h>
-#include <asm/atomic.h>
#include <net/sock.h>
#include <linux/tipc.h>