diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-20 00:05:42 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-20 00:05:42 -0500 |
| commit | 1e6b39fbb61800e3ecee58dc8c4bca57c89365cd (patch) | |
| tree | 513ce034cff05371496713b8327f9dc074bdcc6d /drivers/usb/core/buffer.c | |
| parent | cdbce9c87e4ebd186389919b95e49592ec35dae6 (diff) | |
| parent | 3bedff1d73b86e0cf52634efb447e9ada08f2cc6 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/core/buffer.c')
| -rw-r--r-- | drivers/usb/core/buffer.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c index 57e800ac3cee..419c9943a7cb 100644 --- a/drivers/usb/core/buffer.c +++ b/drivers/usb/core/buffer.c | |||
| @@ -15,14 +15,6 @@ | |||
| 15 | #include <asm/scatterlist.h> | 15 | #include <asm/scatterlist.h> |
| 16 | #include <linux/dma-mapping.h> | 16 | #include <linux/dma-mapping.h> |
| 17 | #include <linux/dmapool.h> | 17 | #include <linux/dmapool.h> |
| 18 | |||
| 19 | |||
| 20 | #ifdef CONFIG_USB_DEBUG | ||
| 21 | #define DEBUG | ||
| 22 | #else | ||
| 23 | #undef DEBUG | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #include <linux/usb.h> | 18 | #include <linux/usb.h> |
| 27 | #include "hcd.h" | 19 | #include "hcd.h" |
| 28 | 20 | ||