X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=blobdiff_plain;f=include%2Flinux%2Fdmar.h;h=d7cecc90ed34069f99c92692b17ed7d91aac2a20;hp=69a6fbac0921bb4be919ed804ee0e9263d149b8b;hb=849e8dea099aafa56db9e74b580b0d858b956533;hpb=18ed61da985c57eea3fe8038b13fa2837c9b3c3f

diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 69a6fbac092..d7cecc90ed3 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -218,16 +218,9 @@ struct dmar_atsr_unit {
 	u8 include_all:1;		/* include all ports */
 };
 
-/* Intel DMAR  initialization functions */
 extern int intel_iommu_init(void);
-#else
-static inline int intel_iommu_init(void)
-{
-#ifdef CONFIG_INTR_REMAP
-	return dmar_dev_scope_init();
-#else
-	return -ENODEV;
-#endif
-}
-#endif /* !CONFIG_DMAR */
+#else /* !CONFIG_DMAR: */
+static inline int intel_iommu_init(void) { return -ENODEV; }
+#endif /* CONFIG_DMAR */
+
 #endif /* __DMAR_H__ */