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 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
device.h
diff --git
a/arch/ia64/include/asm/device.h
b/arch/ia64/include/asm/device.h
index
d66d446
..
d05e78f
100644
(file)
--- a/
arch/ia64/include/asm/device.h
+++ b/
arch/ia64/include/asm/device.h
@@
-10,7
+10,7
@@
struct dev_archdata {
#ifdef CONFIG_ACPI
void *acpi_handle;
#endif
-#ifdef CONFIG_
DMAR
+#ifdef CONFIG_
INTEL_IOMMU
void *iommu; /* hook for IOMMU specific extension */
#endif
};