From 1b447affd6e63ef9eade9ca8e0780870c4237586 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 11 May 2007 13:29:54 +0200
Subject: [PATCH] --- yaml --- r: 55999 b: refs/heads/master c:
 87c1efbfeac49849b981a7eac8cba42d4a49b2e9 h: refs/heads/master i:   55997:
 6322232360622fab56566909e7de006707c0e6a5   55995:
 9266dece07e768c09cd8b767315420be0461061c   55991:
 e6fe5022bc9e7b6154ef9abb01202dbec1830696   55983:
 c980aab62e6d4806f7b9f36117f32f9d9485f8c2   55967:
 0b8d7126249a830652c75bf66b5a541802067f1a   55935:
 a0b3bc37627f648ae1c16934e6adf67148acbf76 v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/genhd.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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