diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 06:07:15 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 06:07:15 -0400 |
| commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
| tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /net/lapb | |
| parent | ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'net/lapb')
| -rw-r--r-- | net/lapb/lapb_iface.c | 1 | ||||
| -rw-r--r-- | net/lapb/lapb_in.c | 1 | ||||
| -rw-r--r-- | net/lapb/lapb_out.c | 1 | ||||
| -rw-r--r-- | net/lapb/lapb_subr.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index bda96d18fd98..d5d8d555c410 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/inet.h> | 29 | #include <linux/inet.h> |
| 30 | #include <linux/if_arp.h> | 30 | #include <linux/if_arp.h> |
| 31 | #include <linux/skbuff.h> | 31 | #include <linux/skbuff.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <net/sock.h> | 33 | #include <net/sock.h> |
| 33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
| 34 | #include <asm/system.h> | 35 | #include <asm/system.h> |
diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c index 6762e7c751eb..21904a002449 100644 --- a/net/lapb/lapb_in.c +++ b/net/lapb/lapb_in.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/inet.h> | 27 | #include <linux/inet.h> |
| 28 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
| 29 | #include <linux/skbuff.h> | 29 | #include <linux/skbuff.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <net/sock.h> | 31 | #include <net/sock.h> |
| 31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 32 | #include <asm/system.h> | 33 | #include <asm/system.h> |
diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c index 339cc5f2684f..c75a79540f9f 100644 --- a/net/lapb/lapb_out.c +++ b/net/lapb/lapb_out.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/net.h> | 25 | #include <linux/net.h> |
| 26 | #include <linux/inet.h> | 26 | #include <linux/inet.h> |
| 27 | #include <linux/skbuff.h> | 27 | #include <linux/skbuff.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <net/sock.h> | 29 | #include <net/sock.h> |
| 29 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
| 30 | #include <asm/system.h> | 31 | #include <asm/system.h> |
diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c index b827f47ac133..43a2a7fb327b 100644 --- a/net/lapb/lapb_subr.c +++ b/net/lapb/lapb_subr.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/net.h> | 24 | #include <linux/net.h> |
| 25 | #include <linux/inet.h> | 25 | #include <linux/inet.h> |
| 26 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <net/sock.h> | 28 | #include <net/sock.h> |
| 28 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 29 | #include <asm/system.h> | 30 | #include <asm/system.h> |