diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /fs/sysfs/sysfs.h | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'fs/sysfs/sysfs.h')
| -rw-r--r-- | fs/sysfs/sysfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index d9be60a2e956..ffaaa816bfba 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h | |||
| @@ -200,7 +200,7 @@ static inline void __sysfs_put(struct sysfs_dirent *sd) | |||
| 200 | struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd); | 200 | struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd); |
| 201 | void sysfs_evict_inode(struct inode *inode); | 201 | void sysfs_evict_inode(struct inode *inode); |
| 202 | int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); | 202 | int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); |
| 203 | int sysfs_permission(struct inode *inode, int mask); | 203 | int sysfs_permission(struct inode *inode, int mask, unsigned int flags); |
| 204 | int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); | 204 | int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); |
| 205 | int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat); | 205 | int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat); |
| 206 | int sysfs_setxattr(struct dentry *dentry, const char *name, const void *value, | 206 | int sysfs_setxattr(struct dentry *dentry, const char *name, const void *value, |