diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2014-07-23 16:04:37 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-23 16:04:37 +0200 |
| commit | cbb24a25a871cbdac4e58b68b541aadd91b249be (patch) | |
| tree | 0b8207913c437d91c938a64a48c1a1751a31a37b /include/linux/device.h | |
| parent | iommu/vt-d: Suppress compiler warnings (diff) | |
| parent | iommu: Fix IOMMU sysfs stubs (diff) | |
| download | wireguard-linux-cbb24a25a871cbdac4e58b68b541aadd91b249be.tar.xz wireguard-linux-cbb24a25a871cbdac4e58b68b541aadd91b249be.zip | |
Merge branch 'core' into x86/vt-d
Conflicts:
drivers/iommu/intel-iommu.c
Diffstat (limited to '')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index af424acd393d..75f5bcb8930b 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -124,7 +124,7 @@ struct bus_type { const struct dev_pm_ops *pm; - struct iommu_ops *iommu_ops; + const struct iommu_ops *iommu_ops; struct subsys_private *p; struct lock_class_key lock_key; |