Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

[deliverable/linux.git] / include / linux / dmar.h

diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index c360c558e59eb5b58952955e3172658ed86f8848..f28440784cf0861eed96d57dada953f8d3113bae 100644 (file)
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -45,7 +45,6 @@ extern struct list_head dmar_drhd_units;
        list_for_each_entry(drhd, &dmar_drhd_units, list)
 
 extern int dmar_table_init(void);
-extern int early_dmar_detect(void);
 extern int dmar_dev_scope_init(void);
 
 /* Intel IOMMU detection */
@@ -145,7 +144,6 @@ struct dmar_rmrr_unit {
        list_for_each_entry(rmrr, &dmar_rmrr_units, list)
 /* Intel DMAR  initialization functions */
 extern int intel_iommu_init(void);
-extern int dmar_disabled;
 #else
 static inline int intel_iommu_init(void)
 {