diff --git a/[refs] b/[refs]
index 03090ae7e262..6a1eb7253817 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b3a93e15b2925a151e9ae13dcb93ad7b3e48aa
+refs/heads/master: 02a5e0acb3cb85d80d0fe834e366d38a92bbaa22
diff --git a/trunk/include/linux/bio.h b/trunk/include/linux/bio.h
index 4d85262b4fa4..1ddef34f43c3 100644
--- a/trunk/include/linux/bio.h
+++ b/trunk/include/linux/bio.h
@@ -24,6 +24,8 @@
 #include <linux/mempool.h>
 #include <linux/ioprio.h>
 
+#ifdef CONFIG_BLOCK
+
 /* Platforms may set this to teach the BIO layer about IOMMU hardware. */
 #include <asm/io.h>
 
@@ -361,4 +363,5 @@ static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
 	__bio_kmap_irq((bio), (bio)->bi_idx, (flags))
 #define bio_kunmap_irq(buf,flags)	__bio_kunmap_irq(buf, flags)
 
+#endif /* CONFIG_BLOCK */
 #endif /* __LINUX_BIO_H */