git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
device.h
diff --git
a/arch/x86/include/asm/device.h
b/arch/x86/include/asm/device.h
index
029f230
..
63a2a03
100644
(file)
--- a/
arch/x86/include/asm/device.h
+++ b/
arch/x86/include/asm/device.h
@@
-8,7
+8,7
@@
struct dev_archdata {
#ifdef CONFIG_X86_64
struct dma_map_ops *dma_ops;
#endif
-#if defined(CONFIG_
DMAR
) || defined(CONFIG_AMD_IOMMU)
+#if defined(CONFIG_
INTEL_IOMMU
) || defined(CONFIG_AMD_IOMMU)
void *iommu; /* hook for IOMMU specific extension */
#endif
};