diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-11-27 00:40:46 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-11-27 00:40:46 -0600 |
| commit | 6f3caf1587dbccd4cab287c7319af8270a0057e3 (patch) | |
| tree | 9ac690df609b3d52bbe1bdd124b62106a7bcef2a /include | |
| parent | 828bb5f408cbae3c7dae1545f3ceb0bba55cdf47 (diff) | |
| parent | fdb47bc680c33d211a64768e758860ef5dfa0fae (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 1 | ||||
| -rw-r--r-- | include/linux/kobject.h | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index a88c4c7a3433..9835d4fcdb12 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -270,6 +270,7 @@ struct device { being off. */ unsigned char *saved_state; /* saved device state */ + u64 *dma_mask; /* dma mask (if dma'able device) */ void (*release)(struct device * dev); }; diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 7b3157a78f7e..6b528c5a61cb 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -60,4 +60,13 @@ static inline void subsys_put(struct subsystem * s) kobject_put(&s->kobj); } +struct subsys_attribute { + struct attribute attr; + ssize_t (*show)(struct subsystem *, char *, size_t, loff_t); + ssize_t (*store)(struct subsystem *, const char *, size_t, loff_t); +}; + +extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); +extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *); + #endif /* _KOBJECT_H_ */ |