diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /block/genhd.c | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| download | linux-0a1340c185734a57fbf4775927966ad4a1347b02.tar.gz linux-0a1340c185734a57fbf4775927966ad4a1347b02.tar.bz2 linux-0a1340c185734a57fbf4775927966ad4a1347b02.zip | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/block/genhd.c b/block/genhd.c index 5a8d3bf02f17..25d1f42568cc 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -2,7 +2,6 @@ * gendisk handling */ -#include <linux/config.h> #include <linux/module.h> #include <linux/fs.h> #include <linux/genhd.h> @@ -17,8 +16,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 +509,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 |