ath10k: handle FW API differences for scan structures

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

diff --git a/include/linux/device.h b/include/linux/device.h
index eeb3331..bcf8c0d 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -84,6 +84,7 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  *              bus-specific setup
  * @p:         The private data of the driver core, only the driver core can
  *             touch this.
+ * @lock_key:  Lock class key for use by the lock validator
  *
  * A bus is a channel between the processor and one or more devices. For the
  * purposes of the device model, all devices are connected via a bus, even if
@@ -642,6 +643,7 @@ struct acpi_dev_node {
  *             segment limitations.
  * @dma_pools: Dma pools (if dma'ble device).
  * @dma_mem:   Internal for coherent mem override.
+ * @cma_area:  Contiguous memory area for dma allocations
  * @archdata:  For arch-specific additions.
  * @of_node:   Associated device tree node.
  * @acpi_node: Associated ACPI device node.
@@ -655,6 +657,8 @@ struct acpi_dev_node {
  * @release:   Callback to free the device after all references have
  *             gone away. This should be set by the allocator of the
  *             device (i.e. the bus driver that discovered the device).
+ * @iommu_group: IOMMU group the device belongs to.
+ *
  * @offline_disabled: If set, the device is permanently online.
  * @offline:   Set after successful invocation of bus type's .offline().
  *