git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hid-suspend' into picolcd
[pandora-kernel.git]
/
block
/
bsg.c
diff --git
a/block/bsg.c
b/block/bsg.c
index
a9fd2d8
..
82d5882
100644
(file)
--- a/
block/bsg.c
+++ b/
block/bsg.c
@@
-21,6
+21,7
@@
#include <linux/idr.h>
#include <linux/bsg.h>
#include <linux/smp_lock.h>
#include <linux/idr.h>
#include <linux/bsg.h>
#include <linux/smp_lock.h>
+#include <linux/slab.h>
#include <scsi/scsi.h>
#include <scsi/scsi_ioctl.h>
#include <scsi/scsi.h>
#include <scsi/scsi_ioctl.h>
@@
-260,7
+261,7
@@
bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
return ERR_PTR(ret);
/*
return ERR_PTR(ret);
/*
- * map scatter-gather elements sep
e
rately and string them to request
+ * map scatter-gather elements sep
a
rately and string them to request
*/
rq = blk_get_request(q, rw, GFP_KERNEL);
if (!rq)
*/
rq = blk_get_request(q, rw, GFP_KERNEL);
if (!rq)