Merge branch 'core' into x86/vt-d

Conflicts:
	drivers/iommu/intel-iommu.c

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;