Merge branch 'late/kirkwood' into late/soc

[karo-tx-linux.git] / arch / arm / plat-omap / include / plat / omap_device.h

diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/plat-omap/include/plat/omap_device.h
index 27bcc24411950f86de7f91db0fb8a542e5e3cf3c..106f50665804952edaf78b3f21167a78b9d5e1ec 100644 (file)
--- a/arch/arm/plat-omap/include/plat/omap_device.h
+++ b/arch/arm/plat-omap/include/plat/omap_device.h
@@ -60,6 +60,7 @@ extern struct dev_pm_domain omap_device_pm_domain;
  * @_dev_wakeup_lat_limit: dev wakeup latency limit in nsec - set by OMAP PM
  * @_state: one of OMAP_DEVICE_STATE_* (see above)
  * @flags: device flags
+ * @_driver_status: one of BUS_NOTIFY_*_DRIVER from <linux/device.h>
  *
  * Integrates omap_hwmod data into Linux platform_device.
  *
@@ -73,6 +74,7 @@ struct omap_device {
        struct omap_device_pm_latency   *pm_lats;
        u32                             dev_wakeup_lat;
        u32                             _dev_wakeup_lat_limit;
+       unsigned long                   _driver_status;
        u8                              pm_lats_cnt;
        s8                              pm_lat_level;
        u8                              hwmods_cnt;