From b78e74997078990d297755f4316f222854f80591 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 6 Jan 2006 00:20:43 -0800
Subject: [PATCH] --- yaml --- r: 16557 b: refs/heads/master c:
 2989ddbd6e1d9638a188311b896362c4bf7b7c25 h: refs/heads/master i:   16555:
 dc0ddf3bacf5306e3479463a3edf25b976e67b2f v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/md/md.c           | 4 ++--
 trunk/include/linux/raid/md_k.h | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bf969be901fe..a184561e2011 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f188593ee7af8c71755d2df269a7a5f62c4b695e
+refs/heads/master: 2989ddbd6e1d9638a188311b896362c4bf7b7c25
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index c1613854f38d..3cf089349e77 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -144,7 +144,7 @@ static int start_readonly;
  *  start array, stop array, error, add device, remove device,
  *  start build, activate spare
  */
-DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
+static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
 static atomic_t md_event_count;
 void md_new_event(mddev_t *mddev)
 {
@@ -279,7 +279,7 @@ static inline void mddev_unlock(mddev_t * mddev)
 	md_wakeup_thread(mddev->thread);
 }
 
-mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr)
+static mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr)
 {
 	mdk_rdev_t * rdev;
 	struct list_head *tmp;
diff --git a/trunk/include/linux/raid/md_k.h b/trunk/include/linux/raid/md_k.h
index 12b3203e3419..0fb5af6d622d 100644
--- a/trunk/include/linux/raid/md_k.h
+++ b/trunk/include/linux/raid/md_k.h
@@ -263,8 +263,6 @@ static inline char * mdname (mddev_t * mddev)
 	return mddev->gendisk ? mddev->gendisk->disk_name : "mdX";
 }
 
-extern mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr);
-
 /*
  * iterates through some rdev ringlist. It's safe to remove the
  * current 'rdev'. Dont touch 'tmp' though.