Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index fd7537f7d11e..99d4fb19a08a 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -99,19 +99,19 @@ netx_hif_irq_type(unsigned int _irq, unsigned int type)
 
         irq = _irq - NETX_IRQ_HIF_CHAINED(0);
 
-        if (type & __IRQT_RISEDGE) {
+        if (type & IRQ_TYPE_EDGE_RISING) {
                 DEBUG_IRQ("rising edges\n");
                 val |= (1 << 26) << irq;
         }
-        if (type & __IRQT_FALEDGE) {
+        if (type & IRQ_TYPE_EDGE_FALLING) {
                 DEBUG_IRQ("falling edges\n");
                 val &= ~((1 << 26) << irq);
         }
-        if (type & __IRQT_LOWLVL) {
+        if (type & IRQ_TYPE_LEVEL_LOW) {
                 DEBUG_IRQ("low level\n");
                 val &= ~((1 << 26) << irq);
         }
-        if (type & __IRQT_HIGHLVL) {
+        if (type & IRQ_TYPE_LEVEL_HIGH) {
                 DEBUG_IRQ("high level\n");
                 val |= (1 << 26) << irq;
         }