---

yaml --- r: 235614 b: refs/heads/master c: 2b15287 h: refs/heads/master v: v3
git-mirror · Jan 21, 2011 · 930c428 · 930c428
1 parent ffba2f5
commit 930c428
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98069c3f1cd353eda61d8e11ce40f83d5c5a99f3
+refs/heads/master: 2b152873469d2b0751e8b726df6415f05e37632e
diff --git a/trunk/drivers/staging/zram/Kconfig b/trunk/drivers/staging/zram/Kconfig
@@ -1,6 +1,6 @@
 config ZRAM
 	tristate "Compressed RAM block device support"
-	depends on BLOCK
+	depends on BLOCK && SYSFS
 	select LZO_COMPRESS
 	select LZO_DECOMPRESS
 	default n

diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
@@ -626,14 +626,12 @@ static int create_device(struct zram *zram, int device_id)
 
 	add_disk(zram->disk);
 
-#ifdef CONFIG_SYSFS
 	ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
 				&zram_disk_attr_group);
 	if (ret < 0) {
 		pr_warning("Error creating sysfs group");
 		goto out;
 	}
-#endif
 
 	zram->init_done = 0;
 
@@ -643,10 +641,8 @@ static int create_device(struct zram *zram, int device_id)
 
 static void destroy_device(struct zram *zram)
 {
-#ifdef CONFIG_SYSFS
 	sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
 			&zram_disk_attr_group);
-#endif
 
 	if (zram->disk) {
 		del_gendisk(zram->disk);

diff --git a/trunk/drivers/staging/zram/zram_sysfs.c b/trunk/drivers/staging/zram/zram_sysfs.c
@@ -17,8 +17,6 @@
 
 #include "zram_drv.h"
 
-#ifdef CONFIG_SYSFS
-
 static u64 zram_stat64_read(struct zram *zram, u64 *v)
 {
 	u64 val;
@@ -220,5 +218,3 @@ static struct attribute *zram_disk_attrs[] = {
 struct attribute_group zram_disk_attr_group = {
 	.attrs = zram_disk_attrs,
 };
-
-#endif	/* CONFIG_SYSFS */