diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /drivers/usb/storage/scsiglue.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
| -rw-r--r-- | drivers/usb/storage/scsiglue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 4cc035562cc2..d8d98cfecada 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 43 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/slab.h> | ||
| 47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 48 | #include <linux/mutex.h> | 47 | #include <linux/mutex.h> |
| 49 | 48 | ||