summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/device.h
diff options
context:
space:
mode:
authorAlessandro Rubini <rubini@gnudd.com>2012-04-04 21:39:58 +0400
committerH. Peter Anvin <hpa@zytor.com>2012-04-12 22:09:56 +0400
commit4692d77fc3c8978a36406a3cf9e8b899f86f68f1 (patch)
tree44466891638efecf6e0253f9a87a48739924f397 /arch/x86/include/asm/device.h
parent0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff)
downloadlinux-4692d77fc3c8978a36406a3cf9e8b899f86f68f1.tar.xz
x86-32: Introduce CONFIG_X86_DEV_DMA_OPS
32-bit x86 systems may need their own DMA operations, so add a new config option, which is turned on for 64-bit systems. This patch has no functional effect but it paves the way for supporting the STA2x11 I/O Hub and possibly other chips. Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Link: http://lkml.kernel.org/r/f79fcc1a2e17ef942e1b798b92aac43a80202532.1333560789.git.rubini@gnudd.com Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/device.h')
-rw-r--r--arch/x86/include/asm/device.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
index 63a2a03d7d51..93e1c55f14ab 100644
--- a/arch/x86/include/asm/device.h
+++ b/arch/x86/include/asm/device.h
@@ -5,8 +5,8 @@ struct dev_archdata {
#ifdef CONFIG_ACPI
void *acpi_handle;
#endif
-#ifdef CONFIG_X86_64
-struct dma_map_ops *dma_ops;
+#ifdef CONFIG_X86_DEV_DMA_OPS
+ struct dma_map_ops *dma_ops;
#endif
#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU)
void *iommu; /* hook for IOMMU specific extension */