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/input/itmtouch.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/usb/input/itmtouch.c')
| -rw-r--r-- | drivers/usb/input/itmtouch.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c index 3b581853cf10..4a50acb39d29 100644 --- a/drivers/usb/input/itmtouch.c +++ b/drivers/usb/input/itmtouch.c | |||
| @@ -40,13 +40,6 @@ | |||
| 40 | *****************************************************************************/ | 40 | *****************************************************************************/ |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | 42 | #include <linux/config.h> |
| 43 | |||
| 44 | #ifdef CONFIG_USB_DEBUG | ||
| 45 | #define DEBUG | ||
| 46 | #else | ||
| 47 | #undef DEBUG | ||
| 48 | #endif | ||
| 49 | |||
| 50 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| 51 | #include <linux/slab.h> | 44 | #include <linux/slab.h> |
| 52 | #include <linux/input.h> | 45 | #include <linux/input.h> |