diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:15:57 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:15:57 +0200 |
commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
tree | a49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/amd_iommu_types.h | |
parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/amd_iommu_types.h')
-rw-r--r-- | include/asm-x86/amd_iommu_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/amd_iommu_types.h b/include/asm-x86/amd_iommu_types.h index dcc81206739..1ffa4e53c98 100644 --- a/include/asm-x86/amd_iommu_types.h +++ b/include/asm-x86/amd_iommu_types.h @@ -17,8 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __AMD_IOMMU_TYPES_H__ -#define __AMD_IOMMU_TYPES_H__ +#ifndef ASM_X86__AMD_IOMMU_TYPES_H +#define ASM_X86__AMD_IOMMU_TYPES_H #include <linux/types.h> #include <linux/list.h> @@ -341,4 +341,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn) return (((u16)bus) << 8) | devfn; } -#endif +#endif /* ASM_X86__AMD_IOMMU_TYPES_H */ |