From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Jul 2008 01:05:04 +0000 (+1000)
Subject: more sysdev API change fallout - drivers/base/memory.c
X-Git-Tag: v2.6.27-rc1~35
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1f07be1c31cf898e5e3708d52e38db0803c62924;p=linux-2.6-omap-h63xx.git

more sysdev API change fallout - drivers/base/memory.c

Noticed because of this warning:

  drivers/base/memory.c:279: warning: initialization from incompatible pointer type

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3ad49a00029..af0d175c025 100644
--- a/drivers/base/memory.c
+++ b/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;