diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
| commit | f333b3f111e9db76109e304df8ee777ace7fbf86 (patch) | |
| tree | ce9a74a7327020c48c80d278e1db5f12552f0fb0 /drivers/usb/core/sysfs.c | |
| parent | f4256e301d9800b1e0276404cb01b3ac85b51067 (diff) | |
| parent | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/usb/core/sysfs.c')
| -rw-r--r-- | drivers/usb/core/sysfs.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index edd83e014452..71d881327e88 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c | |||
| @@ -12,14 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/config.h> | 13 | #include <linux/config.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | |||
| 16 | #ifdef CONFIG_USB_DEBUG | ||
| 17 | #define DEBUG | ||
| 18 | #else | ||
| 19 | #undef DEBUG | ||
| 20 | #endif | ||
| 21 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
| 22 | |||
| 23 | #include "usb.h" | 16 | #include "usb.h" |
| 24 | 17 | ||
| 25 | /* endpoint stuff */ | 18 | /* endpoint stuff */ |