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://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
pci-dma.c
diff --git
a/arch/ia64/kernel/pci-dma.c
b/arch/ia64/kernel/pci-dma.c
index
f6b1ff0
..
c16162c
100644
(file)
--- a/
arch/ia64/kernel/pci-dma.c
+++ b/
arch/ia64/kernel/pci-dma.c
@@
-14,7
+14,7
@@
#include <asm/system.h>
-#ifdef CONFIG_
DMAR
+#ifdef CONFIG_
INTEL_IOMMU
#include <linux/kernel.h>