diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 01:23:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 01:23:27 -0400 |
| commit | a3634d7169f56eca5e349fce2f1de228fc10efda (patch) | |
| tree | f15da7d958c111cab9e36ede4a7044f52a88f6ff /fs/sysfs/sysfs.h | |
| parent | 53173920dab204a31ef37e7d2cb25b964a8a7752 (diff) | |
| parent | 710701c8fc4f6e0c67a98a0b9ca0d75656115957 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
add SubmittingPatches to Documentation/ja_JP
fix typo in SubmittingPatches
Driver Core: fix bug in device_rename() for SYSFS_DEPRECATED=y
sysfs: make sysfs_{get,put}_active() static
kobject: check for duplicate names in kobject_rename
Driver core: remove class_device_*_bin_file
Diffstat (limited to 'fs/sysfs/sysfs.h')
| -rw-r--r-- | fs/sysfs/sysfs.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index f8417988f6b0..ff17f8da9b43 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h | |||
| @@ -103,8 +103,6 @@ extern const struct file_operations sysfs_dir_operations; | |||
| 103 | extern const struct inode_operations sysfs_dir_inode_operations; | 103 | extern const struct inode_operations sysfs_dir_inode_operations; |
| 104 | 104 | ||
| 105 | struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd); | 105 | struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd); |
| 106 | struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd); | ||
| 107 | void sysfs_put_active(struct sysfs_dirent *sd); | ||
| 108 | struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd); | 106 | struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd); |
| 109 | void sysfs_put_active_two(struct sysfs_dirent *sd); | 107 | void sysfs_put_active_two(struct sysfs_dirent *sd); |
| 110 | void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt, | 108 | void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt, |