diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2011-06-06 06:43:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-07 01:55:11 -0400 |
commit | a6b7a407865aab9f849dd99a71072b7cd1175116 (patch) | |
tree | 42995f2e25b777e8930b5ac180599f8d4e655df6 /net | |
parent | aedfebbaa7a4883dc568d8d32b7b32a0f9833f41 (diff) |
net: remove interrupt.h inclusion from netdevice.h
* remove interrupt.g inclusion from netdevice.h -- not needed
* fixup fallout, add interrupt.h and hardirq.h back where needed.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/atm/pppoatm.c | 1 | ||||
-rw-r--r-- | net/caif/chnl_net.c | 1 | ||||
-rw-r--r-- | net/can/bcm.c | 1 | ||||
-rw-r--r-- | net/rds/ib.h | 1 | ||||
-rw-r--r-- | net/rds/iw.h | 1 | ||||
-rw-r--r-- | net/sched/sch_atm.c | 1 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c index e9aced0ec56b..db4a11c61d15 100644 --- a/net/atm/pppoatm.c +++ b/net/atm/pppoatm.c | |||
@@ -37,6 +37,7 @@ | |||
37 | 37 | ||
38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
40 | #include <linux/interrupt.h> | ||
40 | #include <linux/skbuff.h> | 41 | #include <linux/skbuff.h> |
41 | #include <linux/slab.h> | 42 | #include <linux/slab.h> |
42 | #include <linux/atm.h> | 43 | #include <linux/atm.h> |
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index adbb424403d4..c628a57953c9 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include <linux/version.h> | 10 | #include <linux/version.h> |
11 | #include <linux/fs.h> | 11 | #include <linux/fs.h> |
12 | #include <linux/hardirq.h> | ||
12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
14 | #include <linux/netdevice.h> | 15 | #include <linux/netdevice.h> |
diff --git a/net/can/bcm.c b/net/can/bcm.c index 184a6572b67e..d6c8ae5b2e6a 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -43,6 +43,7 @@ | |||
43 | 43 | ||
44 | #include <linux/module.h> | 44 | #include <linux/module.h> |
45 | #include <linux/init.h> | 45 | #include <linux/init.h> |
46 | #include <linux/interrupt.h> | ||
46 | #include <linux/hrtimer.h> | 47 | #include <linux/hrtimer.h> |
47 | #include <linux/list.h> | 48 | #include <linux/list.h> |
48 | #include <linux/proc_fs.h> | 49 | #include <linux/proc_fs.h> |
diff --git a/net/rds/ib.h b/net/rds/ib.h index 4297d92788dc..edfaaaf164eb 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <rdma/ib_verbs.h> | 4 | #include <rdma/ib_verbs.h> |
5 | #include <rdma/rdma_cm.h> | 5 | #include <rdma/rdma_cm.h> |
6 | #include <linux/interrupt.h> | ||
6 | #include <linux/pci.h> | 7 | #include <linux/pci.h> |
7 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
8 | #include "rds.h" | 9 | #include "rds.h" |
diff --git a/net/rds/iw.h b/net/rds/iw.h index 90151922178c..04ce3b193f79 100644 --- a/net/rds/iw.h +++ b/net/rds/iw.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _RDS_IW_H | 1 | #ifndef _RDS_IW_H |
2 | #define _RDS_IW_H | 2 | #define _RDS_IW_H |
3 | 3 | ||
4 | #include <linux/interrupt.h> | ||
4 | #include <rdma/ib_verbs.h> | 5 | #include <rdma/ib_verbs.h> |
5 | #include <rdma/rdma_cm.h> | 6 | #include <rdma/rdma_cm.h> |
6 | #include "rds.h" | 7 | #include "rds.h" |
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 3f08158b8688..e25e49061a0d 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
6 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
8 | #include <linux/interrupt.h> | ||
8 | #include <linux/string.h> | 9 | #include <linux/string.h> |
9 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
10 | #include <linux/skbuff.h> | 11 | #include <linux/skbuff.h> |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index c3c232a88d94..a385430c722a 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <linux/sunrpc/svc_xprt.h> | 42 | #include <linux/sunrpc/svc_xprt.h> |
43 | #include <linux/sunrpc/debug.h> | 43 | #include <linux/sunrpc/debug.h> |
44 | #include <linux/sunrpc/rpc_rdma.h> | 44 | #include <linux/sunrpc/rpc_rdma.h> |
45 | #include <linux/interrupt.h> | ||
45 | #include <linux/sched.h> | 46 | #include <linux/sched.h> |
46 | #include <linux/slab.h> | 47 | #include <linux/slab.h> |
47 | #include <linux/spinlock.h> | 48 | #include <linux/spinlock.h> |
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 80f8da344df5..28236bab57f9 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c | |||
@@ -47,6 +47,7 @@ | |||
47 | * o buffer memory | 47 | * o buffer memory |
48 | */ | 48 | */ |
49 | 49 | ||
50 | #include <linux/interrupt.h> | ||
50 | #include <linux/pci.h> /* for Tavor hack below */ | 51 | #include <linux/pci.h> /* for Tavor hack below */ |
51 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
52 | 53 | ||