diff --git a/[refs] b/[refs]
index 654cf32927e7..688d57cdc63d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 015ab17dc2e9de805c26e74f498b12ee5e8de07e
+refs/heads/master: 519a05491586dad04e687660e54c57882315b22b
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index 8e5a445ba93a..95ae3a9aea8a 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -1589,7 +1589,7 @@ static inline void iommu_prepare_isa(void)
 }
 #endif /* !CONFIG_DMAR_FLPY_WA */
 
-int __init init_dmars(void)
+static int __init init_dmars(void)
 {
 	struct dmar_drhd_unit *drhd;
 	struct dmar_rmrr_unit *rmrr;
diff --git a/trunk/include/linux/dma_remapping.h b/trunk/include/linux/dma_remapping.h
index 952df39c989d..cf92c4924b8c 100644
--- a/trunk/include/linux/dma_remapping.h
+++ b/trunk/include/linux/dma_remapping.h
@@ -141,7 +141,6 @@ struct device_domain_info {
 	struct dmar_domain *domain; /* pointer to domain */
 };
 
-extern int init_dmars(void);
 extern void free_dmar_iommu(struct intel_iommu *iommu);
 
 extern int dmar_disabled;