diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /arch/arm/plat-mxc/irq-common.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'arch/arm/plat-mxc/irq-common.c')
| -rw-r--r-- | arch/arm/plat-mxc/irq-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/irq-common.c b/arch/arm/plat-mxc/irq-common.c index 0c799ac27730..e1c6eff7258a 100644 --- a/arch/arm/plat-mxc/irq-common.c +++ b/arch/arm/plat-mxc/irq-common.c | |||
| @@ -29,7 +29,7 @@ int imx_irq_set_priority(unsigned char irq, unsigned char prio) | |||
| 29 | 29 | ||
| 30 | ret = -ENOSYS; | 30 | ret = -ENOSYS; |
| 31 | 31 | ||
| 32 | base = get_irq_chip(irq); | 32 | base = irq_get_chip(irq); |
| 33 | if (base) { | 33 | if (base) { |
| 34 | chip = container_of(base, struct mxc_irq_chip, base); | 34 | chip = container_of(base, struct mxc_irq_chip, base); |
| 35 | if (chip->set_priority) | 35 | if (chip->set_priority) |
| @@ -48,7 +48,7 @@ int mxc_set_irq_fiq(unsigned int irq, unsigned int type) | |||
| 48 | 48 | ||
| 49 | ret = -ENOSYS; | 49 | ret = -ENOSYS; |
| 50 | 50 | ||
| 51 | base = get_irq_chip(irq); | 51 | base = irq_get_chip(irq); |
| 52 | if (base) { | 52 | if (base) { |
| 53 | chip = container_of(base, struct mxc_irq_chip, base); | 53 | chip = container_of(base, struct mxc_irq_chip, base); |
| 54 | if (chip->set_irq_fiq) | 54 | if (chip->set_irq_fiq) |