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 tag 'efi-urgent' into x86/efi
[pandora-kernel.git]
/
include
/
linux
/
blk_types.h
diff --git
a/include/linux/blk_types.h
b/include/linux/blk_types.h
index
d8e4cea
..
66c2167
100644
(file)
--- a/
include/linux/blk_types.h
+++ b/
include/linux/blk_types.h
@@
-5,8
+5,6
@@
#ifndef __LINUX_BLK_TYPES_H
#define __LINUX_BLK_TYPES_H
-#ifdef CONFIG_BLOCK
-
#include <linux/types.h>
struct bio_set;
@@
-28,6
+26,8
@@
struct bio_vec {
unsigned int bv_offset;
};
+#ifdef CONFIG_BLOCK
+
struct bvec_iter {
sector_t bi_sector; /* device address in 512 byte
sectors */