diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /include/linux/dmar.h | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'include/linux/dmar.h')
| -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 | { |