From ad964f88fa4d336c5bf25f701444db33daa185dc Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 18 Feb 2008 13:45:55 +0100
Subject: [PATCH] --- yaml --- r: 85881 b: refs/heads/master c:
 52ff4cae65b45dcdfa23de09619754d6f380f31e h: refs/heads/master i:   85879:
 fd38390f91a77cffcc4ed9cb7f767cea32a5552f v: v3

---
 [refs]                     | 2 +-
 trunk/block/blk-settings.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f3acc223c598..47f05dfe3cc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13341598263011e079386b22ea35e482f97714c0
+refs/heads/master: 52ff4cae65b45dcdfa23de09619754d6f380f31e
diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c
index c8d0c5724098..13536a388d27 100644
--- a/trunk/block/blk-settings.c
+++ b/trunk/block/blk-settings.c
@@ -386,7 +386,7 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask)
 }
 EXPORT_SYMBOL(blk_queue_update_dma_alignment);
 
-int __init blk_settings_init(void)
+static int __init blk_settings_init(void)
 {
 	blk_max_low_pfn = max_low_pfn - 1;
 	blk_max_pfn = max_pfn - 1;