diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-06 12:54:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-06 12:54:42 +1100 |
| commit | 22c5ad75576843203b06c8b62bf2daf04b172f69 (patch) | |
| tree | caabac2149deeee71e536a298c0d28e05c0182d7 /include/linux | |
| parent | bf05f285b584238d6c10c2ab6f1fc4c40c336b98 (diff) | |
| parent | 5db524bd469290212781e1cb0293b57a7a1c000a (diff) | |
Merge commit 'scsi/master'
Conflicts:
drivers/scsi/scsi_ioctl.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7035cec583b6..044467ef7b11 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -690,6 +690,8 @@ struct rq_map_data { struct page **pages; int page_order; int nr_entries; + unsigned long offset; + int null_mapped; }; struct req_iterator { |