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/notify.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/notify.c')
| -rw-r--r-- | drivers/usb/core/notify.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c index 37da059eced7..fbbebab52fbd 100644 --- a/drivers/usb/core/notify.c +++ b/drivers/usb/core/notify.c | |||
| @@ -12,13 +12,7 @@ | |||
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/notifier.h> | 14 | #include <linux/notifier.h> |
| 15 | #ifdef CONFIG_USB_DEBUG | ||
| 16 | #define DEBUG | ||
| 17 | #else | ||
| 18 | #undef DEBUG | ||
| 19 | #endif | ||
| 20 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
| 21 | |||
| 22 | #include "usb.h" | 16 | #include "usb.h" |
| 23 | 17 | ||
| 24 | 18 | ||