aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-03-04 11:23:45 +0100
committerJens Axboe <jens.axboe@oracle.com>2008-03-04 11:28:29 +0100
commitff88972c850ced92b9c4c7f538d85829c741eeb0 (patch)
treee7cfb7e15db26f35da6e982b934417f3909017a6
parent278caf0120a77e4398762357a8cc522d094fe2f2 (diff)
downloadkernel_samsung_smdk4412-ff88972c850ced92b9c4c7f538d85829c741eeb0.zip
kernel_samsung_smdk4412-ff88972c850ced92b9c4c7f538d85829c741eeb0.tar.gz
kernel_samsung_smdk4412-ff88972c850ced92b9c4c7f538d85829c741eeb0.tar.bz2
proper prototype for blk_dev_init()
This patch adds a proper prototye for blk_dev_init() in block/blk.h Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/blk.h2
-rw-r--r--block/genhd.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/block/blk.h b/block/blk.h
index ec898dd..ec9120f 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -32,6 +32,8 @@ void blk_recalc_rq_sectors(struct request *rq, int nsect);
void blk_queue_congestion_threshold(struct request_queue *q);
+int blk_dev_init(void);
+
/*
* Return the threshold (number of used requests) at which the queue is
* considered to be congested. It include a little hysteresis to keep the
diff --git a/block/genhd.c b/block/genhd.c
index 53f2238..abc6fed 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -17,6 +17,8 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
+#include "blk.h"
+
static DEFINE_MUTEX(block_class_lock);
#ifndef CONFIG_SYSFS_DEPRECATED
struct kobject *block_depr;
@@ -346,8 +348,6 @@ const struct seq_operations partitions_op = {
#endif
-extern int blk_dev_init(void);
-
static struct kobject *base_probe(dev_t devt, int *part, void *data)
{
if (request_module("block-major-%d-%d", MAJOR(devt), MINOR(devt)) > 0)