summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2008-11-20 15:49:49 +0000
committerJoerg Roedel <joerg.roedel@amd.com>2009-01-03 11:57:35 +0100
commit58fa7304a2c2bfd46e505c293ef779aa1d9715c2 (patch)
tree924dcf821a9ec6e1601d5e0b7c22bbbeaf0f3634
parenta647dacbb1389aa6a5fa631766c1eaea35905890 (diff)
downloadop-kernel-dev-58fa7304a2c2bfd46e505c293ef779aa1d9715c2.zip
op-kernel-dev-58fa7304a2c2bfd46e505c293ef779aa1d9715c2.tar.gz
intel-iommu: kill off duplicate def of dmar_disabled
This is only used in dmar.c and intel-iommu.h, so dma_remapping.h seems like the appropriate place for it. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--include/linux/dmar.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f1984fc..f284407 100644
--- a/include/linux/dmar.h
+++ b/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)
{
OpenPOWER on IntegriCloud