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;