diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /net/atm/addr.c | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'net/atm/addr.c')
| -rw-r--r-- | net/atm/addr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/atm/addr.c b/net/atm/addr.c index 82e85abc303d..dcda35c66f15 100644 --- a/net/atm/addr.c +++ b/net/atm/addr.c | |||
| @@ -4,7 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/atm.h> | 5 | #include <linux/atm.h> |
| 6 | #include <linux/atmdev.h> | 6 | #include <linux/atmdev.h> |
| 7 | #include <asm/uaccess.h> | 7 | #include <linux/slab.h> |
| 8 | #include <linux/uaccess.h> | ||
| 8 | 9 | ||
| 9 | #include "signaling.h" | 10 | #include "signaling.h" |
| 10 | #include "addr.h" | 11 | #include "addr.h" |