diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /drivers/base/base.h | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
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); |