Merge branch 'driver-core-next' into Linux 3.2

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

diff --git a/include/linux/device.h b/include/linux/device.h
index acf505e4fe94b3bb9a3dbc5ecdaa27d5492b4be9..96acef8dd916a1d951ffd86e4ed3d33a8e0c7898 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -71,7 +71,7 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  * @resume:    Called to bring a device on this bus out of sleep mode.
  * @pm:                Power management operations of this bus, callback the specific
  *             device driver's pm-ops.
- * @iommu_ops   IOMMU specific operations for this bus, used to attach IOMMU
+ * @iommu_ops:  IOMMU specific operations for this bus, used to attach IOMMU
  *              driver implementations to a bus and allow the driver to do
  *              bus-specific setup
  * @p:         The private data of the driver core, only the driver core can
@@ -755,6 +755,11 @@ static inline bool device_async_suspend_enabled(struct device *dev)
        return !!dev->power.async_suspend;
 }
 
+static inline void pm_suspend_ignore_children(struct device *dev, bool enable)
+{
+       dev->power.ignore_children = enable;
+}
+
 static inline void device_lock(struct device *dev)
 {
        mutex_lock(&dev->mutex);