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 /drivers/net/irda/nsc-ircc.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/irda/nsc-ircc.c')
| -rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 2413295ebd90..e30cdbb14745 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | ********************************************************************/ | 43 | ********************************************************************/ |
| 44 | 44 | ||
| 45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 46 | #include <linux/gfp.h> | ||
| 46 | 47 | ||
| 47 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 48 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| @@ -50,7 +51,6 @@ | |||
| 50 | #include <linux/netdevice.h> | 51 | #include <linux/netdevice.h> |
| 51 | #include <linux/ioport.h> | 52 | #include <linux/ioport.h> |
| 52 | #include <linux/delay.h> | 53 | #include <linux/delay.h> |
| 53 | #include <linux/slab.h> | ||
| 54 | #include <linux/init.h> | 54 | #include <linux/init.h> |
| 55 | #include <linux/rtnetlink.h> | 55 | #include <linux/rtnetlink.h> |
| 56 | #include <linux/dma-mapping.h> | 56 | #include <linux/dma-mapping.h> |