diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 16:26:31 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 16:26:31 +0200 |
commit | b7d0b6784565b846f3562608dfb3cf8516718724 (patch) | |
tree | 50a4931ce7e62e78b664bb8f43da2f4508c319f9 /include/asm-x86/device.h | |
parent | cdcf772ed163651cacac8098b4974aba7f9e1c73 (diff) | |
parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) |
Merge branch 'linus' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/intel_cacheinfo.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/device.h')
-rw-r--r-- | include/asm-x86/device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h index 87a715367a1..3c034f48fdb 100644 --- a/include/asm-x86/device.h +++ b/include/asm-x86/device.h @@ -5,6 +5,9 @@ struct dev_archdata { #ifdef CONFIG_ACPI void *acpi_handle; #endif +#ifdef CONFIG_X86_64 +struct dma_mapping_ops *dma_ops; +#endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ #endif |