diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2008-11-20 10:49:49 -0500 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-01-03 05:57:35 -0500 |
| commit | 58fa7304a2c2bfd46e505c293ef779aa1d9715c2 (patch) | |
| tree | 924dcf821a9ec6e1601d5e0b7c22bbbeaf0f3634 /include | |
| parent | a647dacbb1389aa6a5fa631766c1eaea35905890 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmar.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h index f1984fc3e06d..f28440784cf0 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h | |||
| @@ -144,7 +144,6 @@ struct dmar_rmrr_unit { | |||
| 144 | list_for_each_entry(rmrr, &dmar_rmrr_units, list) | 144 | list_for_each_entry(rmrr, &dmar_rmrr_units, list) |
| 145 | /* Intel DMAR initialization functions */ | 145 | /* Intel DMAR initialization functions */ |
| 146 | extern int intel_iommu_init(void); | 146 | extern int intel_iommu_init(void); |
| 147 | extern int dmar_disabled; | ||
| 148 | #else | 147 | #else |
| 149 | static inline int intel_iommu_init(void) | 148 | static inline int intel_iommu_init(void) |
| 150 | { | 149 | { |