projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
[linux-2.6-block.git]
/
include
/
asm-x86
/
device.h
diff --git
a/include/asm-x86/device.h
b/include/asm-x86/device.h
index dbe8855438958d20aa926882c2b20986201719c4..1bece04c7d9d9b829d6d51abe191ce1b8abf0da9 100644
(file)
--- 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