diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /net/decnet | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/decnet')
| -rw-r--r-- | net/decnet/af_decnet.c | 1 | ||||
| -rw-r--r-- | net/decnet/dn_dev.c | 1 | ||||
| -rw-r--r-- | net/decnet/dn_nsp_in.c | 1 | ||||
| -rw-r--r-- | net/decnet/dn_nsp_out.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 19acd00a6382..4136987d94da 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
| @@ -119,7 +119,6 @@ Version 0.0.6 2.1.110 07-aug-98 Eduardo Marcelo Serrat | |||
| 119 | #include <net/sock.h> | 119 | #include <net/sock.h> |
| 120 | #include <net/tcp_states.h> | 120 | #include <net/tcp_states.h> |
| 121 | #include <net/flow.h> | 121 | #include <net/flow.h> |
| 122 | #include <asm/system.h> | ||
| 123 | #include <asm/ioctls.h> | 122 | #include <asm/ioctls.h> |
| 124 | #include <linux/capability.h> | 123 | #include <linux/capability.h> |
| 125 | #include <linux/mm.h> | 124 | #include <linux/mm.h> |
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 16efcda2f060..a4aecb09d12a 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include <linux/notifier.h> | 42 | #include <linux/notifier.h> |
| 43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
| 44 | #include <asm/uaccess.h> | 44 | #include <asm/uaccess.h> |
| 45 | #include <asm/system.h> | ||
| 46 | #include <net/net_namespace.h> | 45 | #include <net/net_namespace.h> |
| 47 | #include <net/neighbour.h> | 46 | #include <net/neighbour.h> |
| 48 | #include <net/dst.h> | 47 | #include <net/dst.h> |
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c index 73fa268fe2e8..f6544b2c91b0 100644 --- a/net/decnet/dn_nsp_in.c +++ b/net/decnet/dn_nsp_in.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | #include <linux/slab.h> | 60 | #include <linux/slab.h> |
| 61 | #include <net/sock.h> | 61 | #include <net/sock.h> |
| 62 | #include <net/tcp_states.h> | 62 | #include <net/tcp_states.h> |
| 63 | #include <asm/system.h> | ||
| 64 | #include <linux/fcntl.h> | 63 | #include <linux/fcntl.h> |
| 65 | #include <linux/mm.h> | 64 | #include <linux/mm.h> |
| 66 | #include <linux/termios.h> | 65 | #include <linux/termios.h> |
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c index bd78836a81eb..e446e85e64a6 100644 --- a/net/decnet/dn_nsp_out.c +++ b/net/decnet/dn_nsp_out.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #include <linux/route.h> | 52 | #include <linux/route.h> |
| 53 | #include <linux/slab.h> | 53 | #include <linux/slab.h> |
| 54 | #include <net/sock.h> | 54 | #include <net/sock.h> |
| 55 | #include <asm/system.h> | ||
| 56 | #include <linux/fcntl.h> | 55 | #include <linux/fcntl.h> |
| 57 | #include <linux/mm.h> | 56 | #include <linux/mm.h> |
| 58 | #include <linux/termios.h> | 57 | #include <linux/termios.h> |