upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 4bb694c..c64cec3 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -106,6 +106,8 @@ struct device_driver {
        struct kobject          kobj;
        struct list_head        devices;
 
+       struct module           * owner;
+
        int     (*probe)        (struct device * dev);
        int     (*remove)       (struct device * dev);
        void    (*shutdown)     (struct device * dev);
@@ -266,12 +268,7 @@ struct device {
        void            *platform_data; /* Platform specific data (e.g. ACPI,
                                           BIOS data relevant to device) */
        struct dev_pm_info      power;
-       u32             power_state;    /* Current operating state. In
-                                          ACPI-speak, this is D0-D3, D0
-                                          being fully functional, and D3
-                                          being off. */
 
-       unsigned char *saved_state;     /* saved device state */
        u32             detach_state;   /* State to enter when device is
                                           detached from its driver. */
 
@@ -320,11 +317,13 @@ extern int device_for_each_child(struct device *, void *,
                     int (*fn)(struct device *, void *));
 
 /*
- * Manual binding of a device to driver. See drivers/base/bus.c 
+ * Manual binding of a device to driver. See drivers/base/bus.c
  * for information on use.
  */
+extern int  driver_probe_device(struct device_driver * drv, struct device * dev);
 extern void device_bind_driver(struct device * dev);
 extern void device_release_driver(struct device * dev);
+extern int  device_attach(struct device * dev);
 extern void driver_attach(struct device_driver * drv);