diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:47:43 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:47:43 -0500 |
| commit | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (patch) | |
| tree | 7f027e92e4578e293b20ac1f2c389600a795ea7f /drivers/usb/core/devices.c | |
| parent | f3c91c1deaf8493526d8216be94c33e963f00962 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'drivers/usb/core/devices.c')
| -rw-r--r-- | drivers/usb/core/devices.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index ddb4dc98092..a3d2e239965 100644 --- a/drivers/usb/core/devices.c +++ b/drivers/usb/core/devices.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | #include <linux/gfp.h> | 54 | #include <linux/gfp.h> |
| 55 | #include <linux/poll.h> | 55 | #include <linux/poll.h> |
| 56 | #include <linux/usb.h> | 56 | #include <linux/usb.h> |
| 57 | #include <linux/smp_lock.h> | ||
| 58 | #include <linux/usbdevice_fs.h> | 57 | #include <linux/usbdevice_fs.h> |
| 59 | #include <linux/usb/hcd.h> | 58 | #include <linux/usb/hcd.h> |
| 60 | #include <linux/mutex.h> | 59 | #include <linux/mutex.h> |