From 6014aa1a9461757c63626cb75c49e259111fd4b5 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Jul 2008 11:05:04 +1000
Subject: [PATCH] --- yaml --- r: 106659 b: refs/heads/master c:
 1f07be1c31cf898e5e3708d52e38db0803c62924 h: refs/heads/master i:   106657:
 d256dce8ec52711bef9d2ad4f4082962a1a9dd96   106655:
 b682a2b800fa4183d62fca1a0c2429d55befcf2d v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/base/memory.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9d1a06ba638d..2a14dd4877c4 100644
--- 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
index 3ad49a00029f..af0d175c025d 100644
--- 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;