summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-07-30 14:37:07 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-07-30 14:37:07 +1000
commitfac69ca5b6bab43a7a2fc43a8284a38c859857d7 (patch)
tree74ce2f632778c0ef6e7109783295fe066ee64977 /fs
parentbf52296d0b3fd2d8e4f8b4bfb5f48723b3d6512f (diff)
parent81557cdf1505b93c0b5237d476bd71ce155b6e2f (diff)
Merge branch 'quilt/driver-core'
Diffstat (limited to 'fs')
-rw-r--r--fs/sysfs/file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 1beaa739d0a6..1b27b5688f62 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -593,7 +593,8 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group);
* @mode: file permissions.
*
*/
-int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode)
+int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr,
+ mode_t mode)
{
struct sysfs_dirent *sd;
struct iattr newattrs;