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/host | |
| parent | f3c91c1deaf8493526d8216be94c33e963f00962 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/isp1362-hcd.c | 1 | ||||
| -rw-r--r-- | drivers/usb/host/uhci-debug.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c index 8196fa11fec4..6c4fb4efb4bb 100644 --- a/drivers/usb/host/isp1362-hcd.c +++ b/drivers/usb/host/isp1362-hcd.c | |||
| @@ -70,7 +70,6 @@ | |||
| 70 | #include <linux/ioport.h> | 70 | #include <linux/ioport.h> |
| 71 | #include <linux/sched.h> | 71 | #include <linux/sched.h> |
| 72 | #include <linux/slab.h> | 72 | #include <linux/slab.h> |
| 73 | #include <linux/smp_lock.h> | ||
| 74 | #include <linux/errno.h> | 73 | #include <linux/errno.h> |
| 75 | #include <linux/init.h> | 74 | #include <linux/init.h> |
| 76 | #include <linux/list.h> | 75 | #include <linux/list.h> |
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c index 6e7fb5f38db6..ee60cd3ea642 100644 --- a/drivers/usb/host/uhci-debug.c +++ b/drivers/usb/host/uhci-debug.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/debugfs.h> | 14 | #include <linux/debugfs.h> |
| 15 | #include <linux/smp_lock.h> | ||
| 16 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 17 | 16 | ||
| 18 | #include "uhci-hcd.h" | 17 | #include "uhci-hcd.h" |