diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/atm/addr.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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" |