---

yaml --- r: 106659 b: refs/heads/master c: 1f07be1 h: refs/heads/master i: 106657: d256dce 106655: b682a2b v: v3
git-mirror · Jul 28, 2008 · 6014aa1 · 6014aa1
1 parent 40b75bb
commit 6014aa1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b032bf70df2e43149ce2b4e9a865b076c6140753
+refs/heads/master: 1f07be1c31cf898e5e3708d52e38db0803c62924
diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c
@@ -103,7 +103,8 @@ static ssize_t show_mem_phys_index(struct sys_device *dev,
 /*
  * Show whether the section of memory is likely to be hot-removable
  */
-static ssize_t show_mem_removable(struct sys_device *dev, char *buf)
+static ssize_t show_mem_removable(struct sys_device *dev,
+			struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long start_pfn;
 	int ret;