diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /drivers/usb/wusbcore/wa-rpipe.c | |
| parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'drivers/usb/wusbcore/wa-rpipe.c')
| -rw-r--r-- | drivers/usb/wusbcore/wa-rpipe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c index 7369655f69c..c7b1d8108de 100644 --- a/drivers/usb/wusbcore/wa-rpipe.c +++ b/drivers/usb/wusbcore/wa-rpipe.c | |||
| @@ -60,6 +60,7 @@ | |||
| 60 | #include <linux/init.h> | 60 | #include <linux/init.h> |
| 61 | #include <asm/atomic.h> | 61 | #include <asm/atomic.h> |
| 62 | #include <linux/bitmap.h> | 62 | #include <linux/bitmap.h> |
| 63 | #include <linux/slab.h> | ||
| 63 | 64 | ||
| 64 | #include "wusbhc.h" | 65 | #include "wusbhc.h" |
| 65 | #include "wa-hc.h" | 66 | #include "wa-hc.h" |