Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-kernels.git] / include / linux / dmar.h

diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 69a6fbac0921bb4be919ed804ee0e9263d149b8b..d7cecc90ed34069f99c92692b17ed7d91aac2a20 100644 (file)
--- 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__ */