Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / include / linux / raid / md.h

diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
index eb3e547c8fee37798521949cc4f341df352a6d6d..8ab630b67fcca8c3d0d58237915f2a8b3f0d936a 100644 (file)
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -19,7 +19,6 @@
 #define _MD_H
 
 #include <linux/blkdev.h>
-#include <asm/semaphore.h>
 #include <linux/major.h>
 #include <linux/ioctl.h>
 #include <linux/types.h>
@@ -53,6 +52,8 @@
 #include <linux/raid/md_u.h>
 #include <linux/raid/md_k.h>
 
+#ifdef CONFIG_MD
+
 /*
  * Different major versions are not compatible.
  * Different minor versions are only downward compatible.
@@ -92,8 +93,8 @@ extern int sync_page_io(struct block_device *bdev, sector_t sector, int size,
                        struct page *page, int rw);
 extern void md_do_sync(mddev_t *mddev);
 extern void md_new_event(mddev_t *mddev);
+extern void md_allow_write(mddev_t *mddev);
 
-extern void md_update_sb(mddev_t * mddev);
-
+#endif /* CONFIG_MD */
 #endif