diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/base/base.h | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/base/base.h')
| -rw-r--r-- | drivers/base/base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h index 8d1e8bd48632..645f62692920 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h | |||
| @@ -4,6 +4,8 @@ extern void bus_remove_device(struct device * dev); | |||
| 4 | extern int bus_add_driver(struct device_driver *); | 4 | extern int bus_add_driver(struct device_driver *); |
| 5 | extern void bus_remove_driver(struct device_driver *); | 5 | extern void bus_remove_driver(struct device_driver *); |
| 6 | 6 | ||
| 7 | extern void driver_detach(struct device_driver * drv); | ||
| 8 | |||
| 7 | static inline struct class_device *to_class_dev(struct kobject *obj) | 9 | static inline struct class_device *to_class_dev(struct kobject *obj) |
| 8 | { | 10 | { |
| 9 | return container_of(obj, struct class_device, kobj); | 11 | return container_of(obj, struct class_device, kobj); |