diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-04-30 13:11:13 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-04-30 13:12:47 -0400 |
| commit | 868c522b1b75fd3fd3e6a636b4c344ac08edf13a (patch) | |
| tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /net/lapb/lapb_iface.c | |
| parent | bd6d29c25bb1a24a4c160ec5de43e0004e01f72b (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into core/locking
Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.
Diffstat (limited to 'net/lapb/lapb_iface.c')
| -rw-r--r-- | net/lapb/lapb_iface.c | 1 |
1 files changed, 1 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> |