Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9319
b: refs/heads/master
c: 6132f9e
h: refs/heads/master
i:
  9317: f06b536
  9315: 85c6a27
  9311: edf2b39
v: v3
  • Loading branch information
David Vrabel authored and Russell King committed Sep 26, 2005
1 parent 87b6196 commit f713a74
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cbf8fd9f5aa5164e05cb04d4a34fcbe82f60beeb
refs/heads/master: 6132f9e146150473f803323dc8064a5506e33952
5 changes: 4 additions & 1 deletion trunk/arch/arm/mach-ixp4xx/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
} else if (type & IRQT_LOW) {
int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
irq_type = IXP4XX_IRQ_LEVEL;
}
} else
return -EINVAL;

ixp4xx_config_irq(irq, irq_type);

Expand All @@ -142,6 +143,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)

/* Set the new style */
*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));

return 0;
}

static void ixp4xx_irq_mask(unsigned int irq)
Expand Down

0 comments on commit f713a74

Please sign in to comment.