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/irda/iriap_event.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/irda/iriap_event.c')
| -rw-r--r-- | net/irda/iriap_event.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c index a301cbd93785..703774e29e32 100644 --- a/net/irda/iriap_event.c +++ b/net/irda/iriap_event.c | |||
| @@ -24,6 +24,8 @@ | |||
| 24 | * | 24 | * |
| 25 | ********************************************************************/ | 25 | ********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <linux/slab.h> | ||
| 28 | |||
| 27 | #include <net/irda/irda.h> | 29 | #include <net/irda/irda.h> |
| 28 | #include <net/irda/irlmp.h> | 30 | #include <net/irda/irlmp.h> |
| 29 | #include <net/irda/iriap.h> | 31 | #include <net/irda/iriap.h> |