diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2011-06-06 10:43:46 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-06 22:55:11 -0700 |
| commit | a6b7a407865aab9f849dd99a71072b7cd1175116 (patch) | |
| tree | 42995f2e25b777e8930b5ac180599f8d4e655df6 /include | |
| parent | aedfebbaa7a4883dc568d8d32b7b32a0f9833f41 (diff) | |
| download | linux-3.10-a6b7a407865aab9f849dd99a71072b7cd1175116.tar.gz linux-3.10-a6b7a407865aab9f849dd99a71072b7cd1175116.tar.bz2 linux-3.10-a6b7a407865aab9f849dd99a71072b7cd1175116.zip | |
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 'include')
| -rw-r--r-- | include/linux/arcdevice.h | 1 | ||||
| -rw-r--r-- | include/linux/dccp.h | 1 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 1 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 | ||||
| -rw-r--r-- | include/net/sock.h | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h index 7d650a0e3d8..7216b0daf54 100644 --- a/include/linux/arcdevice.h +++ b/include/linux/arcdevice.h @@ -20,6 +20,7 @@ #include <linux/if_arcnet.h> #ifdef __KERNEL__ +#include <linux/irqreturn.h> #ifndef bool #define bool int diff --git a/include/linux/dccp.h b/include/linux/dccp.h index d638e85dc50..710c04302a1 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h @@ -236,6 +236,7 @@ enum dccp_packet_dequeueing_policy { #ifdef __KERNEL__ #include <linux/in.h> +#include <linux/interrupt.h> #include <linux/ktime.h> #include <linux/list.h> #include <linux/uio.h> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ca333e79e10..336288567c7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1563,7 +1563,6 @@ struct packet_type { struct list_head list; }; -#include <linux/interrupt.h> #include <linux/notifier.h> extern rwlock_t dev_base_lock; /* Device list lock */ diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 6c994c004d1..7851c05833e 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -25,6 +25,7 @@ #ifndef __HCI_CORE_H #define __HCI_CORE_H +#include <linux/interrupt.h> #include <net/bluetooth/hci.h> /* HCI upper protocols */ diff --git a/include/net/sock.h b/include/net/sock.h index f2046e404a6..ebbc0bafe66 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -40,6 +40,7 @@ #ifndef _SOCK_H #define _SOCK_H +#include <linux/hardirq.h> #include <linux/kernel.h> #include <linux/list.h> #include <linux/list_nulls.h> |