---

yaml --- r: 208355 b: refs/heads/master c: de75d60 h: refs/heads/master i: 208353: 657dc19 208351: 847c1bf v: v3
git-mirror · Aug 10, 2010 · 9124337 · 9124337
1 parent 101174b
commit 9124337
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4cc14ec9f0ef579262a81170a2eaf760844c471
+refs/heads/master: de75d60d5ea235e6e09f4962ab22541ce0fe176a
diff --git a/trunk/include/linux/blk_types.h b/trunk/include/linux/blk_types.h
@@ -108,6 +108,8 @@ struct bio {
 #define BIO_POOL_MASK		(1UL << BIO_POOL_OFFSET)
 #define BIO_POOL_IDX(bio)	((bio)->bi_flags >> BIO_POOL_OFFSET)
 
+#endif /* CONFIG_BLOCK */
+
 /*
  * Request flags.  For use in the cmd_flags field of struct request, and in
  * bi_rw of struct bio.  Note that some flags are only valid in either one.
@@ -189,5 +191,4 @@ enum rq_flag_bits {
 #define REQ_IO_STAT		(1 << __REQ_IO_STAT)
 #define REQ_MIXED_MERGE		(1 << __REQ_MIXED_MERGE)
 
-#endif /* CONFIG_BLOCK */
 #endif /* __LINUX_BLK_TYPES_H */