diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/genhd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/block/genhd.c b/block/genhd.c index 8313834596db..a8adf96a4b41 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -22,9 +22,7 @@ | |||
22 | #include "blk.h" | 22 | #include "blk.h" |
23 | 23 | ||
24 | static DEFINE_MUTEX(block_class_lock); | 24 | static DEFINE_MUTEX(block_class_lock); |
25 | #ifndef CONFIG_SYSFS_DEPRECATED | ||
26 | struct kobject *block_depr; | 25 | struct kobject *block_depr; |
27 | #endif | ||
28 | 26 | ||
29 | /* for extended dynamic devt allocation, currently only one major is used */ | 27 | /* for extended dynamic devt allocation, currently only one major is used */ |
30 | #define MAX_EXT_DEVT (1 << MINORBITS) | 28 | #define MAX_EXT_DEVT (1 << MINORBITS) |
@@ -810,10 +808,9 @@ static int __init genhd_device_init(void) | |||
810 | 808 | ||
811 | register_blkdev(BLOCK_EXT_MAJOR, "blkext"); | 809 | register_blkdev(BLOCK_EXT_MAJOR, "blkext"); |
812 | 810 | ||
813 | #ifndef CONFIG_SYSFS_DEPRECATED | ||
814 | /* create top-level block dir */ | 811 | /* create top-level block dir */ |
815 | block_depr = kobject_create_and_add("block", NULL); | 812 | if (!sysfs_deprecated) |
816 | #endif | 813 | block_depr = kobject_create_and_add("block", NULL); |
817 | return 0; | 814 | return 0; |
818 | } | 815 | } |
819 | 816 | ||