---

yaml --- r: 187055 b: refs/heads/master c: 8564a6c h: refs/heads/master i: 187053: 6f040a6 187051: 1167a86 187047: 492a6a1 187039: 95c3bed v: v3
git-mirror · Mar 8, 2010 · f9ddaaf · f9ddaaf
1 parent fca4424
commit f9ddaaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e395ab3d9b6aa09c5f0aa46a1b0a6fc5bd33133
+refs/heads/master: 8564a6c140317de04a71eb203bdbb58845d69f9c
diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c
@@ -309,17 +309,18 @@ static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL);
  * Block size attribute stuff
  */
 static ssize_t
-print_block_size(struct class *class, char *buf)
+print_block_size(struct sysdev_class *class, struct sysdev_class_attribute *attr,
+		 char *buf)
 {
 	return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
 }
 
-static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
+static SYSDEV_CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
 
 static int block_size_init(void)
 {
 	return sysfs_create_file(&memory_sysdev_class.kset.kobj,
-				&class_attr_block_size_bytes.attr);
+				&attr_block_size_bytes.attr);
 }
 
 /*