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.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
hw_irq.h
diff --git
a/arch/x86/include/asm/hw_irq.h
b/arch/x86/include/asm/hw_irq.h
index
0919905
..
eb92a6e
100644
(file)
--- a/
arch/x86/include/asm/hw_irq.h
+++ b/
arch/x86/include/asm/hw_irq.h
@@
-119,7
+119,7
@@
struct irq_cfg {
cpumask_var_t old_domain;
u8 vector;
u8 move_in_progress : 1;
cpumask_var_t old_domain;
u8 vector;
u8 move_in_progress : 1;
-#ifdef CONFIG_I
NTR
_REMAP
+#ifdef CONFIG_I
RQ
_REMAP
struct irq_2_iommu irq_2_iommu;
#endif
};
struct irq_2_iommu irq_2_iommu;
#endif
};