diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
| commit | 0c8c708a7e6b52556ee9079041f504191ec5f0e9 (patch) | |
| tree | fb8da2f5e70ac1d21d41d5a900e48d42c1c999eb /include/asm-x86/iommu.h | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
| parent | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (diff) | |
Merge branch 'x86/core' into x86/unify-cpu-detect
Diffstat (limited to 'include/asm-x86/iommu.h')
| -rw-r--r-- | include/asm-x86/iommu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h index 5f888cc5be49..e86f44148c66 100644 --- a/include/asm-x86/iommu.h +++ b/include/asm-x86/iommu.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_X8664_IOMMU_H | 1 | #ifndef ASM_X86__IOMMU_H |
| 2 | #define _ASM_X8664_IOMMU_H 1 | 2 | #define ASM_X86__IOMMU_H |
| 3 | 3 | ||
| 4 | extern void pci_iommu_shutdown(void); | 4 | extern void pci_iommu_shutdown(void); |
| 5 | extern void no_iommu_init(void); | 5 | extern void no_iommu_init(void); |
| @@ -42,4 +42,4 @@ static inline void gart_iommu_hole_init(void) | |||
| 42 | } | 42 | } |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | #endif | 45 | #endif /* ASM_X86__IOMMU_H */ |