diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 19:44:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 19:44:22 +0100 |
| commit | 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch) | |
| tree | d4933996296141103b1f54e563268b23c95d6dd4 /drivers/usb/host/uhci-debug.c | |
| parent | staging: fix winbond build, needs delay.h (diff) | |
| parent | Un-inline get_pipe_info() helper function (diff) | |
| download | linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.xz linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.zip | |
Merge branch 'master' into work
Diffstat (limited to 'drivers/usb/host/uhci-debug.c')
| -rw-r--r-- | drivers/usb/host/uhci-debug.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ #include <linux/slab.h> #include <linux/kernel.h> #include <linux/debugfs.h> -#include <linux/smp_lock.h> #include <asm/io.h> #include "uhci-hcd.h" |