diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/usb/net/cdc_subset.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/usb/net/cdc_subset.c')
| -rw-r--r-- | drivers/usb/net/cdc_subset.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/net/cdc_subset.c b/drivers/usb/net/cdc_subset.c index f1730b685fd2..f05cfb83c82d 100644 --- a/drivers/usb/net/cdc_subset.c +++ b/drivers/usb/net/cdc_subset.c | |||
| @@ -18,9 +18,6 @@ | |||
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | 20 | #include <linux/config.h> |
| 21 | #ifdef CONFIG_USB_DEBUG | ||
| 22 | # define DEBUG | ||
| 23 | #endif | ||
| 24 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 25 | #include <linux/kmod.h> | 22 | #include <linux/kmod.h> |
| 26 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |