diff --git a/[refs] b/[refs]
index 78a08ecf29b3..2a4faf8bf555 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d89d87965dcbe6fe4f96a2a7e8421b3a75f634d1
+refs/heads/master: 87c1efbfeac49849b981a7eac8cba42d4a49b2e9
diff --git a/trunk/include/linux/genhd.h b/trunk/include/linux/genhd.h
index f589559cf070..4c03ee353e78 100644
--- a/trunk/include/linux/genhd.h
+++ b/trunk/include/linux/genhd.h
@@ -434,6 +434,10 @@ static inline struct block_device *bdget_disk(struct gendisk *disk, int index)
 
 #endif
 
-#endif
+#else /* CONFIG_BLOCK */
+
+static inline void printk_all_partitions(void) { }
+
+#endif /* CONFIG_BLOCK */
 
 #endif