Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[~andy/linux] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 5a8d3bf02f1715702fe94515339f1cdfbfd3d088..8d7339511e5e962dfccca43298a06e24a48df846 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -17,8 +17,7 @@
 #include <linux/buffer_head.h>
 #include <linux/mutex.h>
 
-static struct subsystem block_subsys;
-
+struct subsystem block_subsys;
 static DEFINE_MUTEX(block_subsys_lock);
 
 /*
@@ -511,9 +510,7 @@ static struct kset_uevent_ops block_uevent_ops = {
        .uevent         = block_uevent,
 };
 
-/* declare block_subsys. */
-static decl_subsys(block, &ktype_block, &block_uevent_ops);
-
+decl_subsys(block, &ktype_block, &block_uevent_ops);
 
 /*
  * aggregate disk stat collector.  Uses the same stats that the sysfs