diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 18:40:56 -0400 |
|---|---|---|
| committer | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 18:40:56 -0400 |
| commit | b65b34895437915f411882dd40d704eb0863ffb0 (patch) | |
| tree | 3e9302ab09c9a9068fd8fd80708ef3a35b55e665 /net/lapb/lapb_subr.c | |
| parent | 88cc83772a3c7756b9f2b4ba835545ad90a08409 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge mainline (v2.6.34-rc7)
Diffstat (limited to 'net/lapb/lapb_subr.c')
| -rw-r--r-- | net/lapb/lapb_subr.c | 1 |
1 files changed, 1 insertions, 0 deletions
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> |