diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:41:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:41:30 -0800 |
| commit | a7538a7f87826fb5cacc6959f00dfa9fba6f4b15 (patch) | |
| tree | a0fef9252200a78634f0fa4eaa714c7a40e802b9 /include/linux/sysfs.h | |
| parent | 92320cec611d4ed44a9bd635727d61f6caa669a7 (diff) | |
| parent | dfff0a0671baf4e69fc676bf8150635407548288 (diff) | |
| download | kernel_samsung_tuna-a7538a7f87826fb5cacc6959f00dfa9fba6f4b15.zip kernel_samsung_tuna-a7538a7f87826fb5cacc6959f00dfa9fba6f4b15.tar.gz kernel_samsung_tuna-a7538a7f87826fb5cacc6959f00dfa9fba6f4b15.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Revert "Driver core: let request_module() send a /sys/modules/kmod/-uevent"
Driver core: fix error by cleanup up symlinks properly
make kernel/kmod.c:kmod_mk static
power management: fix struct layout and docs
power management: no valid states w/o pm_ops
Driver core: more fallout from class_device changes for pcmcia
sysfs: move struct sysfs_dirent to private header
driver core: refcounting fix
Driver core: remove class_device_rename
Diffstat (limited to 'include/linux/sysfs.h')
| -rw-r--r-- | include/linux/sysfs.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index f45450b..21805b5 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -17,6 +17,7 @@ struct kobject; struct module; struct nameidata; +struct dentry; struct attribute { const char * name; @@ -68,18 +69,6 @@ struct sysfs_ops { ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t); }; -struct sysfs_dirent { - atomic_t s_count; - struct list_head s_sibling; - struct list_head s_children; - void * s_element; - int s_type; - umode_t s_mode; - struct dentry * s_dentry; - struct iattr * s_iattr; - atomic_t s_event; -}; - #define SYSFS_ROOT 0x0001 #define SYSFS_DIR 0x0002 #define SYSFS_KOBJ_ATTR 0x0004 |