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 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
device.h
diff --git
a/arch/arm/include/asm/device.h
b/arch/arm/include/asm/device.h
index
9f390ce
..
6615f03
100644
(file)
--- a/
arch/arm/include/asm/device.h
+++ b/
arch/arm/include/asm/device.h
@@
-10,6
+10,9
@@
struct dev_archdata {
#ifdef CONFIG_DMABOUNCE
struct dmabounce_device_info *dmabounce;
#endif
+#ifdef CONFIG_IOMMU_API
+ void *iommu; /* private IOMMU data */
+#endif
};
struct pdev_archdata {