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/urb.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/urb.c')
| -rw-r--r-- | drivers/usb/core/urb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index f2a1fed2a802..081796726b95 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c | |||
| @@ -4,12 +4,6 @@ | |||
| 4 | #include <linux/bitops.h> | 4 | #include <linux/bitops.h> |
| 5 | #include <linux/slab.h> | 5 | #include <linux/slab.h> |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | |||
| 8 | #ifdef CONFIG_USB_DEBUG | ||
| 9 | #define DEBUG | ||
| 10 | #else | ||
| 11 | #undef DEBUG | ||
| 12 | #endif | ||
| 13 | #include <linux/usb.h> | 7 | #include <linux/usb.h> |
| 14 | #include "hcd.h" | 8 | #include "hcd.h" |
| 15 | 9 | ||