Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[sfrench/cifs-2.6.git] / block / blk-softirq.c

diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index e660d26ca656f060ca0c5a61952681c7b7d55e66..ce0efc6b26dc54cfabf225d4a78265ef401a9a24 100644 (file)
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -161,7 +161,7 @@ void blk_complete_request(struct request *req)
 }
 EXPORT_SYMBOL(blk_complete_request);
 
-__init int blk_softirq_init(void)
+static __init int blk_softirq_init(void)
 {
        int i;