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/file.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/file.c')
| -rw-r--r-- | drivers/usb/core/file.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index e695308095ae..37b13368c814 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c | |||
| @@ -19,12 +19,6 @@ | |||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
| 21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 22 | |||
| 23 | #ifdef CONFIG_USB_DEBUG | ||
| 24 | #define DEBUG | ||
| 25 | #else | ||
| 26 | #undef DEBUG | ||
| 27 | #endif | ||
| 28 | #include <linux/usb.h> | 22 | #include <linux/usb.h> |
| 29 | 23 | ||
| 30 | #include "usb.h" | 24 | #include "usb.h" |