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/inode.c | |
| parent | f3c91c1deaf8493526d8216be94c33e963f00962 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'drivers/usb/core/inode.c')
| -rw-r--r-- | drivers/usb/core/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index 9819a4cc3b26..b690aa35df9a 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/parser.h> | 39 | #include <linux/parser.h> |
| 40 | #include <linux/notifier.h> | 40 | #include <linux/notifier.h> |
| 41 | #include <linux/seq_file.h> | 41 | #include <linux/seq_file.h> |
| 42 | #include <linux/smp_lock.h> | ||
| 43 | #include <linux/usb/hcd.h> | 42 | #include <linux/usb/hcd.h> |
| 44 | #include <asm/byteorder.h> | 43 | #include <asm/byteorder.h> |
| 45 | #include "usb.h" | 44 | #include "usb.h" |