diff --git a/[refs] b/[refs] index f8d06f6ed61f..9d9cf6c21336 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a647dacbb1389aa6a5fa631766c1eaea35905890 +refs/heads/master: 58fa7304a2c2bfd46e505c293ef779aa1d9715c2 diff --git a/trunk/include/linux/dmar.h b/trunk/include/linux/dmar.h index f1984fc3e06d..f28440784cf0 100644 --- a/trunk/include/linux/dmar.h +++ b/trunk/include/linux/dmar.h @@ -144,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) {