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/irqueue.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/irda/irqueue.c')
| -rw-r--r-- | net/irda/irqueue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c index ba01938becb5..849aaf0dabb5 100644 --- a/net/irda/irqueue.c +++ b/net/irda/irqueue.c | |||
| @@ -192,6 +192,7 @@ | |||
| 192 | * Jean II | 192 | * Jean II |
| 193 | */ | 193 | */ |
| 194 | #include <linux/module.h> | 194 | #include <linux/module.h> |
| 195 | #include <linux/slab.h> | ||
| 195 | 196 | ||
| 196 | #include <net/irda/irda.h> | 197 | #include <net/irda/irda.h> |
| 197 | #include <net/irda/irqueue.h> | 198 | #include <net/irda/irqueue.h> |