diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/usb/storage | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
| download | lwn-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.gz lwn-4a1032faac94ebbf647460ae3e06fc21146eb280.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/alauda.c | 1 | ||||
| -rw-r--r-- | drivers/usb/storage/karma.c | 1 | ||||
| -rw-r--r-- | drivers/usb/storage/option_ms.c | 1 | ||||
| -rw-r--r-- | drivers/usb/storage/scsiglue.c | 1 | ||||
| -rw-r--r-- | drivers/usb/storage/sierra_ms.c | 1 | ||||
| -rw-r--r-- | drivers/usb/storage/transport.c | 2 |
6 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c index 67edc65acb8e..42d0eaed4a01 100644 --- a/drivers/usb/storage/alauda.c +++ b/drivers/usb/storage/alauda.c @@ -32,6 +32,7 @@ */ #include <linux/module.h> +#include <linux/slab.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c index 7953d93a7739..ba1b78906880 100644 --- a/drivers/usb/storage/karma.c +++ b/drivers/usb/storage/karma.c @@ -19,6 +19,7 @@ */ #include <linux/module.h> +#include <linux/slab.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c index 773a5cd38c5a..89460181d122 100644 --- a/drivers/usb/storage/option_ms.c +++ b/drivers/usb/storage/option_ms.c @@ -21,6 +21,7 @@ */ #include <linux/usb.h> +#include <linux/slab.h> #include "usb.h" #include "transport.h" 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 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/slab.h> #include <linux/module.h> #include <linux/mutex.h> diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c index 4395c4100ec2..57fc2f532cab 100644 --- a/drivers/usb/storage/sierra_ms.c +++ b/drivers/usb/storage/sierra_ms.c @@ -3,6 +3,7 @@ #include <scsi/scsi_cmnd.h> #include <scsi/scsi_device.h> #include <linux/usb.h> +#include <linux/slab.h> #include "usb.h" #include "transport.h" diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index 468038126e5e..f253edec3bb8 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c @@ -44,8 +44,8 @@ */ #include <linux/sched.h> +#include <linux/gfp.h> #include <linux/errno.h> -#include <linux/slab.h> #include <linux/usb/quirks.h> |