summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-07-28 03:05:04 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 17:31:58 +0200
commit1f07be1c31cf898e5e3708d52e38db0803c62924 (patch)
tree2e6926cedfea512458f2ffe39765079394aeb56d /drivers/base
parentACPI/CPUIDLE: prevent setting pm_idle to NULL (diff)
downloadlinux-1f07be1c31cf898e5e3708d52e38db0803c62924.tar.xz
linux-1f07be1c31cf898e5e3708d52e38db0803c62924.zip
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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/memory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3ad49a00029f..af0d175c025d 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;