diff --git a/[refs] b/[refs] index 4cc922534901..0412dea41dd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcb71abe7d4c5a0d0368c67da0a7def4fc73497a +refs/heads/master: 95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b diff --git a/trunk/include/linux/iommu.h b/trunk/include/linux/iommu.h index 93617e7779a1..0f318fd549be 100644 --- a/trunk/include/linux/iommu.h +++ b/trunk/include/linux/iommu.h @@ -181,7 +181,7 @@ static inline void iommu_set_fault_handler(struct iommu_domain *domain, { } -static inline int iommu_device_group(struct device *dev, unsigned int *groupid); +static inline int iommu_device_group(struct device *dev, unsigned int *groupid) { return -ENODEV; }